updated ja.po.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2905 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2011-06-16 07:32:14 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2011-06-16 07:32:14 +0000
commit: d0c1d8fe3712b35b1a0192496e8fc306961221b6 (patch)
tree: 4869e82869478115907c37f60e864c6c1f4d7d69
parent: 9c294319c3b50fc48e0d8990bdfc9c897e67aee4 (diff)
31 files changed, 9019 insertions, 8588 deletions
diff --git a/po/be.po b/po/be.po
index 3636fcee..5b6bf36b 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2010-02-22 15:22+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Чытанне ўсіх канфігурацый для кожнага акаунта...\n"
 
@@ -220,7 +220,7 @@ msgstr "памылка пры выкананні загаду imap: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не можа канверсаваць UTF-7 у %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не можа канверсаваць %s у UTF-7\n"
@@ -518,12 +518,12 @@ msgstr "procmine_get_text_content(): Канверсія коду схібіла.
 msgid "can't open mark file\n"
 msgstr "нельга адкрыць файл пазнак\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "нельга атрымаць паведамленне %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Радок загаду друку няправільны: `%s'\n"
@@ -650,7 +650,7 @@ msgstr ""
 "гэтай праграмай; калі гэтага не адбылося, напішыце ў Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -658,27 +658,27 @@ msgstr ""
 "Адкрытыя вокны(о) напісання.\n"
 "Калі ласка, закрыйце ўсе вокны напісання перад рэдагаваннем акаунтаў."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Адкрыццё вакна рэдагавання акаунта...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Стварэнне дрэва каталогаў. Пачакайце, калі ласка..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Стварэнне дрэва каталогаў схібіла."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Стварэнне вакна рэдагавання акаунта...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Рэдагаваць акаунты"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -686,40 +686,40 @@ msgstr ""
 "Новыя паведамленні будуць правераны ў гэтым парадку. Пазначце\n"
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Назва"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Рэдагаваць"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " В_ызнач. акаунт як тыповы "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Сапраўды жадаеце сцерці гэты акаунт '%s'?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Без назвы)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Сцерці акаунт"
 
@@ -822,7 +822,7 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрас"
@@ -840,8 +840,8 @@ msgstr "Выберыце каталог Адраснай кнігі"
 msgid "Auto-registered address"
 msgstr "Аўта-рэгістраваныя адрасы"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/Ф_айл"
 
@@ -861,11 +861,11 @@ msgstr "/Ф_айл/Новы _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
 
@@ -881,21 +881,21 @@ msgstr "/Ф_айл/_Сцерці"
 msgid "/_File/_Save"
 msgstr "/Ф_айл/За_пісаць"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закры_ць"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Праца"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Праца/Капірава_ць"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Праца/_Уставіць"
 
@@ -939,8 +939,8 @@ msgstr "/_Адрас/_Рэдагаваць"
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/Сц_ерці"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Прылады"
 
@@ -952,13 +952,13 @@ msgstr "/_Прылады/Імпартаваць файл _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Даведка"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Даведка/_Пра Sylpheed"
 
@@ -975,7 +975,7 @@ msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1029,17 +1029,17 @@ msgstr "Адрас эл.пошты"
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Каму:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытая копія:"
@@ -1246,7 +1246,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1302,396 +1302,396 @@ msgstr "Карычневы"
 msgid "None"
 msgstr "Няма"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Адкрыць"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Дадаць..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/Сц_ерці"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Уласцівасці..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/Ф_айл/В_ыслаць"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/Ф_айл/Выс_лаць пазней"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/Ф_айл/Запісаць у каталог чарна_вікоў"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/Ф_айл/Запісаць і рэдагаваць да_лей"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/Ф_айл/Далучыць _файл"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/Ф_айл/_Уставіць файл"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/Ф_айл/Уставіць _подпіс"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/Ф_айл/_Далучыць подпіс"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Праца/А_дкаціць"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Праца/_Узнавіць"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Праца/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Праца/_Выразаць"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Праца/Уставіць як _цытату"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Праца/Вылучыць _усё"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Праца/Завярну_ць бягучы параграф"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Праца/Перанесці усе _доўгія радкі"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Праца/А_ўтаперанос"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/Выгляд"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/Выгляд/_Каму"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/Выгляд/_Копія"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/Выгляд/Скрытая коп_ія"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/Выгляд/Зваротны адрас"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/Выгляд/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/Выгляд/Узыходзіць д_а"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/Выгляд/_Лінейка"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/Выгляд/Дадатак"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Выгляд/Наставіць стужку пр_ылад..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/Выгляд/Знаказбор"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Выгляд/Знаказбор/Аўтаматычна"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/Выгляд/Знаказбор/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Выгляд/Знаказбор/Унікод (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Выгляд/Знаказбор/Арабскі (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Выгляд/Знаказбор/Тайскі (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Выгляд/Знаказбор/Тайскі (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Прылады/_Адрасная кніга"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Прылады/_Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Прылады/Дзеянні"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Прылады/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Прылады/Рэдагаваць вонкавым рэдактарам"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Прылады/Зап_ыт пацверджання атрымання"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Прылады/_Подпіс PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Прылады/_Шыфр GPG"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Прылады/Правяраць правапі_с"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэксту\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файла %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку складанага паведамлення."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначаная. Выслаць як ёсць?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Адсутнічаюць дадаткі"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Ліст не мае дадаткаў. Выслаць яго без дадаткаў?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Праверыць атрымальнікаў"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Насамрэч даслаць гэты ліст на наступныя адрасы?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Адпраўнік:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "Адпра_віць"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1699,38 +1699,40 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўленнем."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка пад час адпраўкі паведамлення да %s."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Нельга запісаць паведамленне ў `Дасланыя'."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена ніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Нельга падпісаць паведамленне."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Нельга зашыфраваць паведамленне."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Нельга зашыфраваць ці падпісаць паведамленне."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1741,11 +1743,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1758,15 +1760,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1780,99 +1782,94 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "нельга сцерці старое паведамленне\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "даданне паведамлення ў чаргу...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "сгенераваны Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Стварэнне вакна напісання...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Тып звестак"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Назва файла"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Файл не існуе."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Адкрыццё выканальнага файла"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1883,12 +1880,12 @@ msgstr ""
 "Калі вы жадаеце запусціць яго, запішыце дзе-небудзь, і ўпэўніцеся, што гэта "
 "не вірус ці нешта кшталту шкодных праграм."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для вонкавага рэдактара: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1897,48 +1894,48 @@ msgstr ""
 "Вонкавы рэдактар яшчэ працуе.\n"
 "Скончыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "На_ставіць стужку прылад..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -2437,12 +2434,12 @@ msgstr "Устанаўленне інфармацыі па каталогу...\n
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
@@ -3287,15 +3284,15 @@ msgstr "/Ф_айл/Экспартаваць пошт_у..."
 msgid "/_File/Empty all _trash"
 msgstr "/Ф_айл/Ачысціць см_етніцы"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/Ф_айл/Запісаць як..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/Ф_айл/Настаўленні аркуша..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/Ф_айл/_Друкаваць..."
 
@@ -3312,7 +3309,7 @@ msgstr "/Ф_айл/Вы_йсці"
 msgid "/_Edit/Select _thread"
 msgstr "/_Праца/Вылучыць нітку"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Праца/Зн_айсці ў бягучым лісце..."
 
@@ -3529,35 +3526,35 @@ msgstr "/Выгляд/Ісці да/Наступны памечаны л_іст"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Выгляд/Ісці да/Другі к_аталог..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Выгляд/Знаказбор/Аўтавызначэнне"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Выгляд/Знаказбор/Японскі (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Выгляд/Знаказбор/Японскі (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Выгляд/Знаказбор/Кітайскі (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
 
@@ -3565,11 +3562,11 @@ msgstr "/Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Выгляд/Адкры_ць у новым акне"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/Выгляд/Выточны тэкст паведамлення"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/Выгляд/Усе загалоўкі"
 
@@ -3577,7 +3574,7 @@ msgstr "/Выгляд/Усе загалоўкі"
 msgid "/_View/_Update summary"
 msgstr "/Выгляд/Абнавіць зводку"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/Ліст"
 
@@ -3611,16 +3608,16 @@ msgstr "/Ліст/В_ыслаць лісты з чаргі"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/Ліст/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/Ліст/Напісаць новы ліс_т"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/Ліст/Ад_казаць"
 
@@ -3628,27 +3625,27 @@ msgstr "/Ліст/Ад_казаць"
 msgid "/_Message/Repl_y to"
 msgstr "/Ліст/Адказ"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Ліст/Адказ/ўсім"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Ліст/Адказ/адпраўніку"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Ліст/Адказ/у спіс рассылкі"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Ліст/Пер_аслаць"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/Ліст/Перасла_ць як дадатак"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/Ліст/П_еранакіраваць"
 
@@ -3704,7 +3701,7 @@ msgstr "/Ліст/Марка/Пазначыць як Спам"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Ліст/Марка/Пазначыць як не-Спам"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/Ліст/Пера-рэдагаваць"
 
@@ -3720,23 +3717,23 @@ msgstr "/_Прылады/Фільтр_аваць усе лісты ў катал
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Прылады/Фільтраваць в_ылучаныя лісты"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Прылады/_Стварыць правіла фільтра"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Прылады/_Стварыць правіла фільтра/Аўтаматычна"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Адпраўніку"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Адрасату"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Тэме"
 
@@ -3986,39 +3983,39 @@ msgstr "Тэкст"
 msgid "_None"
 msgstr "Нічога"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Вы не злучаныя. Клікніце іконку, каб злучыцца."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы ў злучэнні. Клікніце іконку, каб адлучыцца."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Выхад"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Выйсці з праграмы?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Вылучаныя паведамленні не могуць быць аб'яднаныя."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Выберыце каталог"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Опцыі загаднага радка"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ужыванне: sylpheed [ОПЦЫЯ]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4048,7 +4045,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4078,15 +4075,15 @@ msgstr ""
 "паказаць гэту даведку і выйсці\n"
 "паказаць звесткі пра версію і выйсці"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Опцыі толькі для аконнага рэжыму:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport нум_порта"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "задаць порт для аддаленых загадаў IPC"
 
@@ -4123,27 +4120,27 @@ msgstr "Канец паведамлення дасягнуты; працягва
 msgid "Search finished"
 msgstr "Пошук скончаны"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Прылады/Дадаць адпраўніка ў адрасную кнігу"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Стварэнне прагляду паведамлення...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Тэкст"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Дадаткі"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Прагляд паведамлення - Сілфід"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Нельга запісаць файл `%s'."
@@ -4200,7 +4197,7 @@ msgstr "Выберыце \"Праверыць подпіс\" для правер
 msgid "Select an action for the attached file:\n"
 msgstr "Выберыце дзеянне для далучанага файла:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Адкры_ць з..."
 
@@ -4208,7 +4205,7 @@ msgstr "Адкры_ць з..."
 msgid "_Display as text"
 msgstr "_Паказаць як тэкст"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Запісаць як..."
 
@@ -4225,7 +4222,8 @@ msgid "_Check signature"
 msgstr "Праверыць подпі_с"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Нельга запісаць частку складанага паведамлення."
 
@@ -4233,11 +4231,11 @@ msgstr "Нельга запісаць частку складанага паве
 msgid "Can't save the attachments."
 msgstr "Нельга запісаць дадаткі."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Адкрыць з"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5970,20 +5968,20 @@ msgstr "Паказаныя элементы"
 msgid " Revert to default "
 msgstr " Узнавіць прадвызначэнні "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Правілы фільтравання"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Уключана"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Сапраўды жадаеце сцерці правіла '%s'?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Сцерці правіла"
 
@@ -7122,7 +7120,7 @@ msgstr "Не знойдзены подпіс"
 msgid "Good signature from \"%s\""
 msgstr "Правільны подпіс ад \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Правільны подпіс"
 
@@ -7131,7 +7129,7 @@ msgstr "Правільны подпіс"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпіс правільны, але ключ для \"%s\" не давераны"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Правільны подпіс (недавераны ключ)"
 
@@ -7167,7 +7165,7 @@ msgstr "Подпіс правільны, але ключ подпісу быў �
 msgid "BAD signature from \"%s\""
 msgstr "НЕСАПРАЎДНЫ подпіс ад \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "ДРЭННЫ подпіс"
 
@@ -7659,19 +7657,29 @@ msgstr "%d ліст(ы) прафільтраваны."
 msgid "file %s already exists\n"
 msgstr "файл %s ужо існуе\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Стварэнне прагляду тэксту...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Паведамленне зашыфраванае, а разшыфраванне не атрымалася.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Адкрыць"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Назва файла"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Гэта паведамленне не можа быць паказана.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7679,35 +7687,35 @@ msgstr ""
 "Тэкст цела паведамлення не можа быць паказаны, бо запіс у часовы файл не "
 "атрымаўся.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Запісаць рысунак як..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Напісаць новае паведамленне"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "Адказа_ць на гэты адрас"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Дадаць да адраснай кн_ігі..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "_Капіраваць адрас"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Адкрыць Веб-бра_ўзерам"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Капіраваць спасы_лку"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7720,7 +7728,7 @@ msgstr ""
 "\n"
 "Адкрыць усе роўна?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Папярэджанне - несапраўдны URL"
 
@@ -7801,3 +7809,9 @@ msgstr ""
 #: plugin/attachment_tool/attachment_tool.c:272
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
+
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Нельга запісаць паведамленне ў `Дасланыя'."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "сгенераваны Message-ID: %s\n"
diff --git a/po/bg.po b/po/bg.po
index b50b1603..7fa88c70 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Четене на конфигурация за всеки акаунт...\n"
 
@@ -228,7 +228,7 @@ msgstr "грешка при imap команда: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -519,12 +519,12 @@ msgstr ""
 msgid "can't open mark file\n"
 msgstr "не може да се отвори файлът с маркировките\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не може да се вземе съобщението %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\n"
@@ -650,7 +650,7 @@ msgstr ""
 "програмата; в случай, че не сте, обърнете се към Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -658,29 +658,29 @@ msgstr ""
 "Има отворени прозорци за съставяне.\n"
 "Моля затворете всички прозорци за съставяне преди редакция на акаунтите."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Отваряне на прозорец за редакция на акаунта...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Създаване на прозорец за редакция на акаунта...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Редакция на акаунтите"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -688,42 +688,42 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Име"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Сървър"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Редактиране"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " Избиране като акаунт по подразбиране"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Желаете ли да изтриете този акаунт?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Неозаглавен"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Изтриване на акаунт"
 
@@ -826,7 +826,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрес"
@@ -845,8 +845,8 @@ msgstr "Изберете папка от адресната книга"
 msgid "Auto-registered address"
 msgstr "Регистрирани правила"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Файл"
 
@@ -867,11 +867,11 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
@@ -887,21 +887,21 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
@@ -948,8 +948,8 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
@@ -962,13 +962,13 @@ msgstr "/_Инструменти/Внасяне на _LDIF файл"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
@@ -985,7 +985,7 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1042,17 +1042,17 @@ msgstr "E-Mail адрес"
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1267,7 +1267,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1323,441 +1323,441 @@ msgstr "Кафяв"
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Отваряне"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Притурки"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1765,40 +1765,42 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Не може да се запази съобщението в изходящата кутия."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1809,12 +1811,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1823,15 +1825,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1840,103 +1842,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "генерирано Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1944,12 +1941,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1959,52 +1956,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2523,12 +2520,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -3404,16 +3401,16 @@ msgstr "/_Файл/_Изнасяне на mbox файл..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
@@ -3430,7 +3427,7 @@ msgstr "/_Файл/Из_ход"
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
@@ -3655,42 +3652,42 @@ msgstr "/_Изглед/П_реход до/Следващо о_цветено с�
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
@@ -3699,11 +3696,11 @@ msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Изглед/_Цялата заглавна част"
@@ -3712,7 +3709,7 @@ msgstr "/_Изглед/_Цялата заглавна част"
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Съобщение"
 
@@ -3752,16 +3749,16 @@ msgstr "/_Съобщение/_Изпращане на съобщенията в
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
@@ -3769,27 +3766,27 @@ msgstr "/_Съобщение/_Отговор"
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
@@ -3850,7 +3847,7 @@ msgstr "/_Съобщение/_Получаване на нова поща"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
@@ -3869,23 +3866,23 @@ msgstr "/_Инструменти/_Филтриране на съобщеният
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
@@ -4151,42 +4148,42 @@ msgstr "Текст"
 msgid "_None"
 msgstr "Никой"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Избор на папка"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4203,7 +4200,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4220,15 +4217,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4265,27 +4262,27 @@ msgstr "Достигнат е краят на съобщението; продъ
 msgid "Search finished"
 msgstr "Търсенето приключи"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Създаване на изглед на съобщениято...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Притурки"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
@@ -4347,7 +4344,7 @@ msgstr "Изберете \"Проверяване на подписа\" за п�
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/_Отваряне със..."
@@ -4357,7 +4354,7 @@ msgstr "/_Отваряне със..."
 msgid "_Display as text"
 msgstr "/_Показване като текст"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/_Запазване като..."
@@ -4375,7 +4372,8 @@ msgid "_Check signature"
 msgstr "/_Проверяване на подписа"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Част от multipart съобщение не може да се запази."
 
@@ -4384,11 +4382,11 @@ msgstr "Част от multipart съобщение не може да се за�
 msgid "Can't save the attachments."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Отваряне със"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6193,21 +6191,21 @@ msgstr "Показани атрибути"
 msgid " Revert to default "
 msgstr "Връщане към подразбиращите се"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Установяване на филтър"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Желаете ли да изтриете правилото?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Изтриване на правило"
 
@@ -7416,7 +7414,7 @@ msgstr "Не е намерен подпис"
 msgid "Good signature from \"%s\""
 msgstr "Валиден подпис от \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Валиден подпис"
 
@@ -7425,7 +7423,7 @@ msgstr "Валиден подпис"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7462,7 +7460,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "НЕВАЛИДЕН подпис от \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "НЕВАЛИДЕН подпис"
 
@@ -7954,59 +7952,69 @@ msgstr ""
 msgid "file %s already exists\n"
 msgstr "файл %s вече съществува\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Създаване на текстов изглед...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Отваряне"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Име на файл"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Съобщението не може да бъде показано.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Публичен адрес"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Публичен адрес"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Уеб браузър"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8015,7 +8023,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8103,6 +8111,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Не може да се запази съобщението в изходящата кутия."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "генерирано Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME Тип"
 
diff --git a/po/cs.po b/po/cs.po
index ea84899a..41164f83 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-23 01:42+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Načítá se nastavení všech účtů...\n"
 
@@ -227,7 +227,7 @@ msgstr "chyba příkazu služby IMAP: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže provést konverzi z UTF-7 na %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže provést konverzi z %s na UTF-7\n"
@@ -525,12 +525,12 @@ msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 msgid "can't open mark file\n"
 msgstr "nelze otevřít označený soubor\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze načíst zprávu %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkaz při tisku: \"%s\"\n"
@@ -657,7 +657,7 @@ msgstr ""
 "programem; pokud se tak nestalo, napište o ni Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -665,27 +665,27 @@ msgstr ""
 "Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
 "Před úpravou účtů zavřete prosím všechna tato okna."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Otevírá se okno nastavení účtu...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Vytváří se strom složek. Čekejte prosím..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Vytvoření stromu složek se nezdařilo."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Vytváří se okno nastavení účtu...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Úpravy účtů"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -693,40 +693,40 @@ msgstr ""
 "Nové zprávy budou kontrolovány v uvedeném pořadí. Pokud má být účet\n"
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Upravit"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " N_astavit účet jako výchozí "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete smazat účet \"%s\"?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Smazat účet"
 
@@ -829,7 +829,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
@@ -847,8 +847,8 @@ msgstr "Vybrat složku adresáře"
 msgid "Auto-registered address"
 msgstr "Automaticky registrované adresy"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Soubor"
 
@@ -868,11 +868,11 @@ msgstr "/_Soubor/Nový _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
@@ -888,21 +888,21 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
@@ -946,8 +946,8 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
@@ -959,13 +959,13 @@ msgstr "/_Nástroje/Importovat soubor _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
@@ -982,7 +982,7 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1036,17 +1036,17 @@ msgstr "E-mailová adresa"
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
@@ -1249,7 +1249,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1305,396 +1305,396 @@ msgstr "Hnědá"
 msgid "None"
 msgstr "Nespecifikováno"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otevřít"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Odeslat"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Soubor/Odesla_t později"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Soubor/Uložit do složky _konceptů"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Soubor/Uložit a pok_račovat v úpravě"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Přiložit soubor"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit podpi_s"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Soubor/Připo_jit podpis"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/Za_rovnat aktuální odstavec"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zar_ovnat všechny dlouhé řádky"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/A_utomatické zarovnávání"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Příjemce"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/K_opie"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/S_krytá kopie"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/Z_obrazit/Odpovědi z_aslat na"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/Z_obrazit/Odpovědi _vystavit na"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Z_obrazit/Up_ravit nástrojovou lištu..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Znaková _sada"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Z_obrazit/Znaková _sada/_Automaticky rozpoznat"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Znaková _sada/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/Znaková _sada/7bitový ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/Znaková _sada/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/Znaková _sada/Středoevropské jazyky (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/Znaková _sada/_Pobaltské jazyky (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/Znaková _sada/Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/Znaková _sada/Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/Znaková _sada/Japonština (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/Znaková _sada/Tradiční čínština (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/Znaková _sada/Korejština (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/Ad_resář"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Nástroje/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Nástroje/Vyžádat _oznámení o doručení"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/Podepsat P_GP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Nástroje/Ši_frovat PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/Kontrolovat pravopi_s"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Příloha není obsažena"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Není obsažena příloha. Odeslat bez příloh?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Zkontrolovat příjemce"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1702,38 +1702,40 @@ 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:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Při posílání zprávy na %s se vyskytla chyba."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Zprávu nelze uložit do odeslané pošty."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Zprávu nelze podepsat."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Zprávu nelze šifrovat."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Zprávu nelze šifrovat nebo podepsat."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1744,11 +1746,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1761,15 +1763,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1783,99 +1785,94 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "vytváří se ID zprávy: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datový typ"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Soubor neexistuje."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Otevírá se spustitelný soubor"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1887,12 +1884,12 @@ msgstr ""
 "Pokud chcete soubor spustit, nejprve jej uložte a ujistěte se, že nejde o "
 "virus či nějaký nebezpečný program."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1901,48 +1898,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 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:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -2442,12 +2439,12 @@ msgstr "Nastavování informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s..."
@@ -3295,15 +3292,15 @@ msgstr "/_Soubor/E_xportovat poštovní zprávy..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/V_yprázdnit všechny koše"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Soubor/_Vzhled stránky..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
@@ -3320,7 +3317,7 @@ msgstr "/_Soubor/U_končit"
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Hledat v aktuální zprávě..."
 
@@ -3538,35 +3535,35 @@ msgstr "/Z_obrazit/_Přejít/Nás_ledující zpráva se štítkem"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Automaticky rozpoznat"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Z_obrazit/_Znaková sada/Západoevropské jazyky (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínština (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejština (ISO-2022-KR)"
 
@@ -3574,11 +3571,11 @@ msgstr "/Z_obrazit/_Znaková sada/Korejština (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/Z_obrazit/Všechna zá_hlaví"
 
@@ -3586,7 +3583,7 @@ msgstr "/Z_obrazit/Všechna zá_hlaví"
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizovat souhrn"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Zpráva"
 
@@ -3620,16 +3617,16 @@ msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
@@ -3637,27 +3634,27 @@ msgstr "/_Zpráva/_Odpovědět"
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_Všem"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_Odesílateli"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/_Elektronické konferenci"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
@@ -3713,7 +3710,7 @@ msgstr "/_Zpráva/Označi_t jako nevyžádanou poštu"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/Označit jako _vyžádanou poštu"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u upravit"
 
@@ -3729,23 +3726,23 @@ msgstr "/_Nástroje/Filtrovat všechny z_právy ve složce"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovat vybrané zprávy"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle _odesílatele"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle pří_jemce"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle _předmětu"
 
@@ -3996,39 +3993,39 @@ msgstr "_Text"
 msgid "_None"
 msgstr "_Nezobrazovat"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Jste v režimu offline. Kliknutím na ikonu přejdete do režimu online."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Jste v režimu online. Kliknutím na ikonu přejdete do režimu offline."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Opravdu ukončit Sylpheed?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Vybrané zprávy nemohou být sloučeny."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Vyberte složku, kterou chcete otevřít"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Přepínače příkazové řádky"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použití: sylpheed [VOLBY]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4058,7 +4055,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4088,15 +4085,15 @@ msgstr ""
 "vypíše tuto nápovědu a skončí\n"
 "vypíše informaci o verzi a skončí"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Volba pouze pro Windows:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport čísloportu"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "určí port pro vzdálené příkazy IPC"
 
@@ -4133,27 +4130,27 @@ msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Vytváří se zobrazení zprávy...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Zobrazení zprávy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nelze uložit soubor \"%s\"."
@@ -4210,7 +4207,7 @@ msgstr "K ověření prosím vyberte \"Zkontrolovat podpis\""
 msgid "Select an action for the attached file:\n"
 msgstr "Vyberte prosím akci s přiloženým souborem:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Ot_evřít čím..."
 
@@ -4218,7 +4215,7 @@ msgstr "Ot_evřít čím..."
 msgid "_Display as text"
 msgstr "_Zobrazit jako text"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Uložit jako..."
 
@@ -4235,7 +4232,8 @@ msgid "_Check signature"
 msgstr "Zkontrolovat po_dpis"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Nelze uložit část ze zprávy s více částmi."
 
@@ -4243,11 +4241,11 @@ msgstr "Nelze uložit část ze zprávy s více částmi."
 msgid "Can't save the attachments."
 msgstr "Nelze uložit přílohy."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5979,20 +5977,20 @@ msgstr "Zobrazované položky"
 msgid " Revert to default "
 msgstr " Výchozí "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Nastavení filtrů"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Zapnuto"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Opravdu chcete smazat pravidlo \"%s\"?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Smazat pravidlo"
 
@@ -7130,7 +7128,7 @@ msgstr "Podpis nenalezen"
 msgid "Good signature from \"%s\""
 msgstr "Podpis od \"%s\" v pořádku"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Podpis v pořádku"
 
@@ -7139,7 +7137,7 @@ msgstr "Podpis v pořádku"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Platný podpis, ale klíč \"%s\" není důvěryhodný"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Platný podpis (nedůvěryhodný klíč)"
 
@@ -7175,7 +7173,7 @@ msgstr "Platný podpis, ale podepisující klíč byl odvolán"
 msgid "BAD signature from \"%s\""
 msgstr "CHYBNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "CHYBNÝ podpis"
 
@@ -7653,19 +7651,29 @@ msgstr "filtrovaných zpráv %d."
 msgid "file %s already exists\n"
 msgstr "soubor %s již existuje\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Vytváří se zobrazení textu...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Tato zpráva je šifrovaná, ale nepodařilo se ji dešifrovat.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Otevřít"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Název souboru"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Tato zpráva nemůže být zobrazena.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7673,35 +7681,35 @@ msgstr ""
 "Tělo zprávy nemohlo být zobrazeno z důvodu selhání zápisu do dočasného "
 "souboru.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Uložit o_brázek jako..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Napsat novou _zprávu"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "Odpovědět na tuto adr_esu"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Přidat do _adresáře..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Kopí_rovat tuto adresu"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Otevřít _webovým prohlížečem"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Kopírovat _tento odkaz"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7714,7 +7722,7 @@ msgstr ""
 "\n"
 "Přesto otevřít?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Varování - podvržená adresa"
 
@@ -7795,3 +7803,9 @@ msgstr ""
 #: plugin/attachment_tool/attachment_tool.c:272
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
+
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Zprávu nelze uložit do odeslané pošty."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "vytváří se ID zprávy: %s\n"
diff --git a/po/da.po b/po/da.po
index 285a6300..c9e588da 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Læs konfiguration for hver konto...\n"
 
@@ -228,7 +228,7 @@ msgstr "fejl ved IMAP kommand: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -523,12 +523,12 @@ msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 msgid "can't open mark file\n"
 msgstr "kan ikke åbne markéret fil\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -654,7 +654,7 @@ msgstr ""
 "program.Hvis ikke, så skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -662,29 +662,29 @@ msgstr ""
 "Der er ny post vinduer åbent.\n"
 "Luk alle ny post vinduer inden rettelse af konti."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Åbn konto redigérings vindue...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Opretter mappe træ...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Opret konto redigérings vindue...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Redigér konti"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -692,42 +692,42 @@ msgstr ""
 "Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Navn"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Redigér"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " Standard konto "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vil du virkelig slette denne konto?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Uden titel"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Slet konto"
 
@@ -830,7 +830,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresse"
@@ -849,8 +849,8 @@ msgstr "Vælg adressebog mappe"
 msgid "Auto-registered address"
 msgstr "Registrerede regler"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Filer"
 
@@ -871,11 +871,11 @@ msgstr "/_Filer/Ny _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
@@ -891,21 +891,21 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
@@ -952,8 +952,8 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
@@ -966,13 +966,13 @@ msgstr "/_Funktioner/Importer _LDIF-Fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
@@ -989,7 +989,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1046,17 +1046,17 @@ msgstr "E-post adresse"
 msgid "Search:"
 msgstr "Søg"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1265,7 +1265,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Note"
 
@@ -1321,441 +1321,441 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Åbn"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Vedhæftet"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Emne:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1763,40 +1763,42 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Kan ikke gemme meddelelse i Sendt"
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1807,12 +1809,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1821,15 +1823,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1838,103 +1840,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "genereret meddelelses ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dato"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME type"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1942,12 +1939,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1957,52 +1954,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2521,12 +2518,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -3405,16 +3402,16 @@ msgstr "/_Filer/_Eksportere mbox fil..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
@@ -3432,7 +3429,7 @@ msgstr "/_Filer/_Afslut"
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
@@ -3657,42 +3654,42 @@ msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
@@ -3701,11 +3698,11 @@ msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Vis/Alle _hoveder"
@@ -3714,7 +3711,7 @@ msgstr "/_Vis/Alle _hoveder"
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
@@ -3754,16 +3751,16 @@ msgstr "/_Meddelelse/Send meddelelser i _kø"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
@@ -3771,27 +3768,27 @@ msgstr "/_Meddelelse/_Besvar"
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
@@ -3852,7 +3849,7 @@ msgstr "/_Meddelelse/Hent _ny post"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
@@ -3871,23 +3868,23 @@ msgstr "/_Funktioner/_Filtrere meddelelse"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
@@ -4153,42 +4150,42 @@ msgstr "Tekst"
 msgid "_None"
 msgstr "Ingen"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vælg mappe"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4205,7 +4202,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4222,15 +4219,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4267,27 +4264,27 @@ msgstr "Slutnigen af meddelelse nået; fortsæt fra starten?"
 msgid "Search finished"
 msgstr "Søgning afsluttet"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Vedhæftet"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
@@ -4349,7 +4346,7 @@ msgstr "Vælg \"Check signatur\""
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/Åbn _med..."
@@ -4359,7 +4356,7 @@ msgstr "/Åbn _med..."
 msgid "_Display as text"
 msgstr "/_Vis som tekst"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/_Gem som..."
@@ -4377,7 +4374,8 @@ msgid "_Check signature"
 msgstr "/_Check signatur"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Kan ikke gemme del af multipart meddelelse."
 
@@ -4386,11 +4384,11 @@ msgstr "Kan ikke gemme del af multipart meddelelse."
 msgid "Can't save the attachments."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Åbn med"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6190,21 +6188,21 @@ msgstr "Viste oplysninger"
 msgid " Revert to default "
 msgstr " Standard indstilling "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Filter opsæt"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich diese Regel Slet?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Slet regel"
 
@@ -7416,7 +7414,7 @@ msgstr "Underskrift ikke fundet"
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Underskrift OK"
 
@@ -7425,7 +7423,7 @@ msgstr "Underskrift OK"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7462,7 +7460,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG underskrift fra \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "DÅRLIG underskrift"
 
@@ -7958,60 +7956,70 @@ msgstr "meddelelse %d er allerede gemt.\n"
 msgid "file %s already exists\n"
 msgstr "filen %s eksisterer allerede\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Opretter tekst vindue...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Åbn"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Fil navn"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "en meddelelse vil ikke blive modtaget\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Normale adresser"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8020,7 +8028,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8108,6 +8116,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Kan ikke gemme meddelelse i Sendt"
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "genereret meddelelses ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME type"
 
diff --git a/po/de.po b/po/de.po
index fcd43be2..f99d76ad 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-28 12:01+0100\n"
 "Last-Translator: Volker Ribbert <volker.nospam@netcologne.de>\n"
 "Language-Team: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen für jedes Mailkonto...\n"
 
@@ -223,7 +223,7 @@ msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -522,12 +522,12 @@ msgstr ""
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht öffnen\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht abrufen\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Befehlszeile zum Drucken ist ungültig: `%s'\n"
@@ -655,7 +655,7 @@ msgstr ""
 "erhalten haben; wenn nicht, dann schreiben Sie an Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -663,27 +663,27 @@ msgstr ""
 "Es sind einige Editor-Fenster geöffnet.\n"
 "Bitte schließen Sie diese Fenster vor dem Beabeiten der Mailkonten."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Öffne Bearbeitungsfenster für Mailkonto...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Erstelle Verzeichnisbaum. Bitte warten ..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Verzeichnisbaum kann nicht erstellt werden."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Erstelle Bearbeitungsenster für Mailkonto ...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Mailkonten bearbeiten"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -693,40 +693,40 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Alle abrufen' "
 "einzuschalten."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Name"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "Als _Standard-Mailkonto setzen"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Möchten Sie das Mailkonto '%s' wirklich löschen?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Mailkonto löschen"
 
@@ -829,7 +829,7 @@ msgstr "Benutzer-Parameter der Aktion"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch übernehmen"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresse"
@@ -847,8 +847,8 @@ msgstr "Adressbuchordner auswählen"
 msgid "Auto-registered address"
 msgstr "Automatischer Adresseintrag"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Datei"
 
@@ -868,11 +868,11 @@ msgstr "/_Datei/Neues _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
@@ -888,21 +888,21 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
@@ -949,8 +949,8 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/E_xtras"
 
@@ -962,13 +962,13 @@ msgstr "/_Extras/Importiere _LDIF-Datei"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Extras/Importiere _CSV-Datei"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Hilfe/I_nfo"
 
@@ -985,7 +985,7 @@ msgid "/New _Folder"
 msgstr "/Neuer Or_dner"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1039,17 +1039,17 @@ msgstr "E-Mail Adresse"
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1259,7 +1259,7 @@ msgstr "Allgemeine Adresse"
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Anmerkung"
 
@@ -1315,396 +1315,396 @@ msgstr "Braun"
 msgid "None"
 msgstr "ohne"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Öffnen"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/Im Ent_wurfsordner speichern"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/Signatur _einfügen"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Datei/_Signatur anhängen"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/_Alles auswählen"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisch umbrechen"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ansicht/_Symbolleiste anpassen..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichenkodierung"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ansicht/_Zeichenkodierung/_Automatisch"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichenkodierung/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichenkodierung/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichenkodierung/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichenkodierung/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichenkodierung/West Europa (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichenkodierung/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichenkodierung/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichenkodierung/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ansicht/_Zeichenkodierung/Baltisch (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichenkodierung/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ansicht/_Zeichenkodierung/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ansicht/_Zeichenkodierung/Arabisch (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichenkodierung/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichenkodierung/Hebräisch (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichenkodierung/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichenkodierung/Vereinfachtes Chinesisch (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichenkodierung/Vereinfachtes Chinesisch (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichenkodierung/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichenkodierung/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichenkodierung/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichenkodierung/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Extras/_Adressbuch"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Extras/_Schablone"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Extras/A_ktionen"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Extras/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Extras/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Extras/E_mpfangsbestätigung anfordern"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Extras/PGP _Unterschreiben"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Extras/PGP _Verschlüsseln"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Extras/_Rechtschreibprüfung"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Extras/_Sprache einstellen"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Formatfehler bei Zitatzeichen."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Dateigröße von %s nicht feststellbar\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Betreff ist leer"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Anhang fehlt"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Es gibt keinen Anhang. Ohne versenden?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Empfänger werden überprüft"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Diese Mail wirklich an folgende Adressen absenden?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1712,37 +1712,39 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen sie vor dem Senden ein Mailkonto."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Kann die Nachricht nicht im Gesendet-Ordner speichern."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Kann die Nachricht nicht signieren."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Kann die Nachricht nicht verschlüsseln."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Kann Nachricht weder signieren noch verschlüsseln."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1753,11 +1755,11 @@ msgstr ""
 "\n"
 "Dennoch als %s senden?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Fehler beim Umsetzen der Kodierung"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1770,15 +1772,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1792,100 +1794,95 @@ msgstr ""
 "\n"
 " Dennoch versenden?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ordner nicht finden\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "erzeugte Nachrichten-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Erstelle Editor-Fenster...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Mit PGP unterschreiben"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Mit PGP verschlüsseln"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Zeichenkodierung"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Datei nicht vorhanden."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Ausführbare Datei öffnen"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1897,12 +1894,12 @@ msgstr ""
 "Um sie auszuführen, speichern Sie sie bitte andernorts und überprüfen sie "
 "auf Viren- oder sonstigen Schadbefall."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Befehlszeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1911,48 +1908,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess dennoch abbrechen (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Symbolleiste anpassen..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Dateien wählen"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Datei wählen"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Nachricht speichern"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Als Entwurf speichern?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Möchten Sie die Vorlage '%s' übernehmen?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Vorlage übernehmen"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2456,12 +2453,12 @@ msgstr "Erstelle Ordnerinformation...\n"
 msgid "Setting folder info..."
 msgstr "Erstelle Ordnerinformation..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ordner %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ordner %s ..."
@@ -3316,15 +3313,15 @@ msgstr "/_Datei/Maildaten _exportieren..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Datei/_Speichern als..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Datei/Seite_neinrichtung..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
@@ -3341,7 +3338,7 @@ msgstr "/_Datei/_Beenden"
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Thread auswählen"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/Aktuelle Nachricht _durchsuchen..."
 
@@ -3559,35 +3556,35 @@ msgstr "/_Ansicht/_Gehe zu/Nächster markier_ter Nachricht"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderem Or_dner..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichenkodierung/_Automatische Erkennung"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/_Zeichenkodierung/West Europa (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichenkodierung/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichenkodierung/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichenkodierung/Koreanisch (ISO-2022-KR)"
 
@@ -3595,11 +3592,11 @@ msgstr "/_Ansicht/_Zeichenkodierung/Koreanisch (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/In neuem _Fenster öffnen"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/_Quelltext der Nachricht"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Ansicht/_Alle Kopfzeilen anzeigen"
 
@@ -3607,7 +3604,7 @@ msgstr "/_Ansicht/_Alle Kopfzeilen anzeigen"
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ordnerinhalt"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Nachricht"
 
@@ -3641,16 +3638,16 @@ msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/_Neue Nachricht verfassen"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/_Antworten"
 
@@ -3658,27 +3655,27 @@ msgstr "/_Nachricht/_Antworten"
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/W_eiterleiten"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umleiten"
 
@@ -3736,7 +3733,7 @@ msgstr "/_Nachricht/Als _Spam markieren"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Als Ni_cht-Spam markieren"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Neu_bearbeiten"
 
@@ -3752,23 +3749,23 @@ msgstr "/_Extras/Alle Nachrichten eines _Ordners filtern"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Extras/Ausgewählte _Nachrichten filtern"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Extras/Filter _erstellen"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Extras/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Extras/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Extras/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Extras/Filter _erstellen/nach _Betreff"
 
@@ -4020,39 +4017,39 @@ msgstr "_Text"
 msgid "_None"
 msgstr "_Keine"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind offline. Klicken Sie zum Verbinden auf das Symbol."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind online. Klicken Sie zum Beenden auf das Symbol."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Ordner zum Öffnen auswählen"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Optionen der Befehlszeile"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Anwendung: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4082,7 +4079,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4111,15 +4108,15 @@ msgstr ""
 "diese Hilfe anzeigen und beenden\n"
 "Versionsinformationen anzeigen und beenden"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      definiert Port für \"IPC remote\" Befehle"
@@ -4157,27 +4154,27 @@ msgstr "Ende der Liste erreicht; weiter vom Anfang?"
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Exras/Absender in Adress_buch einfügen"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansicht - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
@@ -4234,7 +4231,7 @@ msgstr "Wähle \"Digitale Unterschrift überprüfen\" zum Überprüfen"
 msgid "Select an action for the attached file:\n"
 msgstr "Wähle eine Aktion aus für die angehängte Datei:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Öffnen _mit..."
 
@@ -4242,7 +4239,7 @@ msgstr "Öffnen _mit..."
 msgid "_Display as text"
 msgstr "Als _Text darstellen"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Speichern als..."
 
@@ -4259,7 +4256,8 @@ msgid "_Check signature"
 msgstr "/Überprüfe _digitale Unterschrift"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht speichern."
 
@@ -4267,11 +4265,11 @@ msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht speichern."
 msgid "Can't save the attachments."
 msgstr "Kann die Anhänge nicht speichern."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6018,20 +6016,20 @@ msgstr "Angezeigte Einträge"
 msgid " Revert to default "
 msgstr " Standard wiederherstellen"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Filtereinstellungen"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Möchten Sie die Regel '%s' wirklich löschen?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Regel löschen"
 
@@ -7175,7 +7173,7 @@ msgstr "Keine digitale Unterschrift gefunden"
 msgid "Good signature from \"%s\""
 msgstr "Gute digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Gute digitale Unterschrift"
 
@@ -7186,7 +7184,7 @@ msgstr ""
 "Gültige digitale Unterschrift, aber dem Schlüssel für  \"%s\" wird nicht "
 "vertraut."
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Gültige digitale Unterschrift (Schlüssel wird nicht vertraut)"
 
@@ -7228,7 +7226,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "FALSCHE digitale Unterschrift"
 
@@ -7712,20 +7710,30 @@ msgstr "%d Nachricht(en) sind gefiltert."
 msgid "file %s already exists\n"
 msgstr "Datei %s existiert bereits\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Textansicht wird erstellt...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 "Diese Nachricht ist verschlüsselt, konnte aber nicht entschlüsselt werden.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Öffnen"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Dateiname"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht ist nicht darstellbar.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7733,36 +7741,36 @@ msgstr ""
 "Nachrichtentext nicht darstellbar, da kein Schreiben in temporäre Datei "
 "möglich. \n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Dieses Bild speichern _als..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Diese Ad_resse kopieren"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Ins Adress_buch übernehmen"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Diese Ad_resse kopieren"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Im Internet-Browser öffnen"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Diese _Verknüpfung kopieren"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7775,7 +7783,7 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
@@ -7860,5 +7868,11 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Kann die Nachricht nicht im Gesendet-Ordner speichern."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "erzeugte Nachrichten-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME Typ"
diff --git a/po/el.po b/po/el.po
index 1044343d..4c4d6bf1 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Ανάγνωση ρυθμίσεων λογαριασμών...\n"
 
@@ -230,7 +230,7 @@ msgstr "Error while spawning the mbadblocks command: %s."
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %s από το iconv\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
@@ -528,12 +528,12 @@ msgstr "procmime_get_text_content(): Η μετατροπή του κώδικα �
 msgid "can't open mark file\n"
 msgstr "Δεν είναι δυνατό το άνοιγμα του αρχείου"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, fuzzy, c-format
 msgid "can't fetch message %d\n"
 msgstr "Δέν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, fuzzy, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr ""
@@ -665,7 +665,7 @@ msgstr ""
 "(Free Software Foundation) στη διεύθυνση Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02110-1301, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -674,29 +674,29 @@ msgstr ""
 "Παρακαλώ κλείστε όλα τα παράθυρα σύνθεσης μηνύματος πριν επεξεργαστείτε τους "
 "λογαριασμούς."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Άνοιγμα παραθύρου επεξεργασίας λογαριασμού...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Δημιουργία προβολής φακέλων...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Η επαναδημιουργία της λίστας φακέλων απέτυχε."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Δημιουργία παραθύρου επεξεργασίας λογαριασμού...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Επεξεργασία λογαριασμών"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -705,40 +705,40 @@ msgstr ""
 "στη στήλη 'G' για να ενεργοποιήσετε τη λήψη μηνυμάτων με την εντολή 'Λήψη "
 "όλων'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " Ορι_σμός ως προεπιλεγμένου λογαριασμού "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το λογαριασμό '%s';"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Χωρίς τίτλο)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Διαγραφή λογαριασμού"
 
@@ -842,7 +842,7 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -861,8 +861,8 @@ msgstr "Επιλογή φακέλου από το Ευρετήριο διευθ�
 msgid "Auto-registered address"
 msgstr "Αποθηκευμένα πρότυπα"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Αρχείο"
 
@@ -882,11 +882,11 @@ msgstr "/_Αρχείο/Νέο _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
 
@@ -902,21 +902,21 @@ msgstr "/_Αρχείο/_Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
@@ -963,8 +963,8 @@ msgstr "/_Διεύθυνση/_Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
 
@@ -977,13 +977,13 @@ msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
 
@@ -1000,7 +1000,7 @@ msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1054,17 +1054,17 @@ msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
@@ -1284,7 +1284,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1341,401 +1341,401 @@ msgstr "Καφέ"
 msgid "None"
 msgstr "Κανένα"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Άνοιγμα"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Προσθήκη..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Διαγραφή"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ιδιότητες..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Αρχείο/Απο_στολή"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Αρχείο/Αποστο_λή αργότερα"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Αρχείο/Αποθήκευση στον φάκελο _πρόχειρα"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Αρχείο/Αποθήκευση και _συνέχεια επεξεργασίας"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Αρχείο/Επισύνα_ψη αρχείου"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Αρχείο/Ε_ισαγωγή αρχείου"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Αρχείο/Εισαγωγή υπο_γραφής"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Αρχείο/Επισύναψη υπογ_ραφής"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Επεξεργασία/Α_ναίρεση"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Επεξεργασία/Επανά_ληψη"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Επεξεργασία/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Επεξεργασία/Απο_κοπή"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Επεξεργασία/Eπικόλληση ως πα_ράθεση"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Επεξεργασία/Επιλ_ογή όλων"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Επεξεργασία/Ανα_δίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Επεξεργασία/Αναδίπλωση μακρών _γραμμών"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αυτό_ματη αναδίπλωση"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Προβολή"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Προβολή/_Προς"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Προβολή/_Κοινοποίηση"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Προβολή/Κ_ρυφή κοινοποίηση"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Προβολή/_Απάντηση σε"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Προβολή/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Προβολή/_Συνέχεια προς"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Προβολή/_Χάρακας"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Προβολή/Σ_υνημμένου"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Προβολή/Προσαρμογή ε_ργαλειοθήκης..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ελληνικά (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Τούρκικη (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Εργαλεία/_Ευρετήριο διευθύνσεων"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Εργαλεία/_Πρότυπο"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Εργαλεία/Ε_νέργειες"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Εργαλεία/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Εργαλεία/Επεξεργασία με ε_ξωτερικό πρόγραμμα"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Εργαλεία/_Υπογραφή με PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Ε_πιλογές/_Κρυπτογράφηση με PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Συνημμένα"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1743,43 +1743,45 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1790,11 +1792,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1807,15 +1809,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1829,102 +1831,97 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr ""
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Ημερομηνία"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Άνοιγμα εκτελέσιμου αρχείου"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1932,14 +1929,14 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1949,49 +1946,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2508,12 +2505,12 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
@@ -3388,15 +3385,15 @@ msgstr "/_Αρχείο/_Εξαγωγή σε αρχείο mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Αρχείο/Άδειασμα όλων _των φακέλων Απορριμμάτων"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Αρχείο/Αποθήκευση _ως..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Αρχείο/_Διαμόρφωση σελίδας..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Αρχείο/Εκτύ_πωση..."
 
@@ -3413,7 +3410,7 @@ msgstr "/_Αρχείο/Έ_ξοδος"
 msgid "/_Edit/Select _thread"
 msgstr "/_Επεξεργασία/Επιλογή _νήματος"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Επεξεργασία/Εύ_ρεση στο τρέχον μήνυμα..."
 
@@ -3637,35 +3634,35 @@ msgstr "/_Προβολή/Μετά_βαση/Επόμενο σημειωμένο �
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Προβολή/Μετά_βαση/Ά_λλο φάκελο..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Παραδοσιακή Κινέζικη (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κινέζικη (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (ISO-2022-KR)"
 
@@ -3673,11 +3670,11 @@ msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορε
 msgid "/_View/Open in new _window"
 msgstr "/_Προβολή/Άνοι_γμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Προβολή/Πηγαίος _κώδικας μηνύματος"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/Προ_βολή/Ό_λων των κεφαλίδων"
 
@@ -3685,7 +3682,7 @@ msgstr "/Προ_βολή/Ό_λων των κεφαλίδων"
 msgid "/_View/_Update summary"
 msgstr "/_Προβολή/Ανανέ_ωση"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Μήνυμα"
 
@@ -3721,16 +3718,16 @@ msgstr "/_Μήνυμα/Αποστολή μηνυμάτων στην _ουρά"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Μήνυμα/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Μήνυμα/Σύνθεση _νέου μηνύματος"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Μήνυμα/Α_πάντηση"
 
@@ -3738,27 +3735,27 @@ msgstr "/_Μήνυμα/Α_πάντηση"
 msgid "/_Message/Repl_y to"
 msgstr "/_Μήνυμα/Απάντηση _σε"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Μήνυμα/Απάντηση _σε/όλ_ους"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Μήνυμα/Απάντηση _σε/_αποστολέα"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Μήνυμα/Απάντηση _σε/_λίστα αλληλογραφίας"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Μήνυμα/_Προώθηση"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Μήνυμα/Π_ροώθηση ως συνημμένο"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Μήνυμα/Αναμε_τάδοση"
 
@@ -3816,7 +3813,7 @@ msgstr "/_Μήνυμα/Α_νεπιθύμητη αλληλογραφία"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Μήνυμα/Επιθ_υμητή αλληλογραφία"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Μήνυμα/Επαν-_επεξεργασία"
 
@@ -3832,23 +3829,23 @@ msgstr "/_Εργαλεία/_Φιλτράρισμα όλων των μηνυμά�
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Εργαλεία/Φιλτράρισμα ε_πιλεγμένων μηνυμάτων"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/_Αυτόματα"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από τον απο_στολέα"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από τους _παραλήπτες"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από το _θέμα"
 
@@ -4107,40 +4104,40 @@ msgstr "Κείμενο"
 msgid "_None"
 msgstr "Κανένα"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Έξοδος από το πρόγραμμα;"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Επιλογή φακέλου"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: sylpheed [ΕΠΙΛΟΓΗ]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4170,7 +4167,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4200,15 +4197,15 @@ msgstr ""
 "εμφάνιση αυτής της βοήθειας\n"
 "εμφάνιση πληροφοριών έκδοσης"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4245,27 +4242,27 @@ msgstr "Έφτασα το τέλος του μηνύματος. Να συνεχ�
 msgid "Search finished"
 msgstr "Η αναζήτηση τελείωσε"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Εργαλεία/Προσθήκη αποστολέα στο ευρετήριο _διευθύνσεων"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Δημιουργία προβολής μηνύματος...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Κείμενο"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Συνημμένα"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Προβολή μηνύματος - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν είναι δυνατή η αποθήκευση του αρχείου '%s'."
@@ -4326,7 +4323,7 @@ msgstr "Επιλέξτε \"Έλεγχο υπογραφής\" για έλεγχο
 msgid "Select an action for the attached file:\n"
 msgstr "Επιλέξτε μια ενέργεια για το συνημμένο αρχείο:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Άνοιγμα _με..."
 
@@ -4334,7 +4331,7 @@ msgstr "Άνοιγμα _με..."
 msgid "_Display as text"
 msgstr "_Προβολή ως κείμενο"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Αποθήκευση ως..."
 
@@ -4351,7 +4348,8 @@ msgid "_Check signature"
 msgstr "Έλ_εγχος υπογραφής"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Δεν μπορώ να αποθηκεύσω το τμήμα του πολυτμηματικού μηνύματος."
 
@@ -4359,11 +4357,11 @@ msgstr "Δεν μπορώ να αποθηκεύσω το τμήμα του πο�
 msgid "Can't save the attachments."
 msgstr "Δεν είναι δυνατή η αποθήκευση των συνημμένων."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Άνοιγμα με"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6123,21 +6121,21 @@ msgstr "Εμφανιζόμενα αντικείμενα"
 msgid " Revert to default "
 msgstr "Επαναφορά στις προεπιλογές"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Ορισμός φίλτρου"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τον κανόνα '%s';"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Διαγραφή κανόνα"
 
@@ -7301,7 +7299,7 @@ msgstr "Δεν βρέθηκε υπογραφή"
 msgid "Good signature from \"%s\""
 msgstr "Έγκυρη υπογραφή από τον/την \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Έγκυρη υπογραφή"
 
@@ -7310,7 +7308,7 @@ msgstr "Έγκυρη υπογραφή"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Έγκυρη υπογραφή αλλά το κλειδί για το \"%s\" δεν είναι έμπιστο"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Έγκυρη υπογραφή (όχι έμπιστη)"
 
@@ -7346,7 +7344,7 @@ msgstr "Η υπογραφή είναι έγκυρη αλλά το κλειδί �
 msgid "BAD signature from \"%s\""
 msgstr "Εσφαλμένη υπογραφή από τον/την \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Εσφαλμένη υπογραφή"
 
@@ -7839,54 +7837,64 @@ msgstr "Φιλτραρίστηκαν %d μηνύματα."
 msgid "file %s already exists\n"
 msgstr "Το αρχείο \"%s\" υπάρχει ήδη\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Δημιουργία προβολής κειμένου...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Άνοιγμα"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Όνομα αρχείου"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Δεν είναι δυνατή η προβολή αυτού του μηνύματος.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Α_ποθήκευση εικόνας ως..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Σύνθεση _νέου μηνύματος"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Αντιγραφή _διεύθυνσης"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Προσθήκη στο _ευρετήριο διευθύνσεων..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Αντιγραφή _διεύθυνσης"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Άνοιγμα με τον περιηγητή ιστοσελίδων"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Αντιγραφή _συνδέσμου"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7899,7 +7907,7 @@ msgstr ""
 "\n"
 "Θέλετε σίγουρα να την ανοίξετε;"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Προειδοποίηση για μη έγκυρο URL"
 
@@ -7981,6 +7989,9 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
+
 #~ msgid "MIME Type"
 #~ msgstr "Τύπος MIME"
 
diff --git a/po/es.po b/po/es.po
index 8a6472c2..1b822930 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-21 08:45+0200\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuración de cada cuenta...\n"
 
@@ -222,7 +222,7 @@ msgstr "error en el mandato imap: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -520,12 +520,12 @@ msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inválida: «%s»\n"
@@ -653,7 +653,7 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -661,27 +661,27 @@ msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Abriendo ventana de edición de cuenta...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Creando el árbol de carpetas. Espere por favor..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Falló la creación del árbol de carpetas."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Creando ventana de edición de cuenta...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -689,40 +689,40 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "_Establecer como cuenta primaria "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Está seguro de que quiere borrar la cuenta «%s»?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
@@ -825,7 +825,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Dirección"
@@ -843,8 +843,8 @@ msgstr "Seleccionar carpeta de la agenda"
 msgid "Auto-registered address"
 msgstr "Direcciones auto-registradas"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Fichero"
 
@@ -864,11 +864,11 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
@@ -884,21 +884,21 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -942,8 +942,8 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
@@ -955,13 +955,13 @@ msgstr "/_Herramientas/Importar fichero _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
@@ -978,7 +978,7 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1032,17 +1032,17 @@ msgstr "Dirección e-mail"
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1251,7 +1251,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1307,396 +1307,396 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Abrir"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichero/Agregar _firma"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Recortar todas las líneas largas"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Followup-To"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/Configurar barra de _herramientas..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ver/Codificación de caract_eres/_Automática"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Herramientas/Editar con el editor e_xterno"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/Herramientas/Solicitar notificación de _disposición"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Herramientas/_Cifrar con PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Herramientas/_Comprobar ortografía"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, 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:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Falta el adjunto"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "No hay adjunto. ¿Enviarlo sin adjuntos?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Comprobar destinatarios"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1704,39 +1704,41 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "No se puede guardar el mensaje en Salida."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "El mensaje no se puede firmar."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "El mensaje no se puede cifrar."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "El mensaje no se puede cifrar o firmar."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1747,11 +1749,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1764,15 +1766,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1786,99 +1788,94 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "Message-ID generado: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Tipo de datos"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "El fichero no existe."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Abriendo fichero ejecutable"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1890,12 +1887,12 @@ msgstr ""
 "Si quiere lanzarlo, guárdelo en algún lugar y asegúrese de que no es un "
 "virus u otro tipo de software malintencionado."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1904,48 +1901,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 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:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2446,12 +2443,12 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3300,15 +3297,15 @@ msgstr "/_Fichero/_Exportar correo..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Fichero/Config_urar página..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
@@ -3325,7 +3322,7 @@ msgstr "/_Fichero/Sali_r"
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
@@ -3542,35 +3539,35 @@ msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
@@ -3578,11 +3575,11 @@ msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Ver/_Todas las cabeceras"
 
@@ -3590,7 +3587,7 @@ msgstr "/_Ver/_Todas las cabeceras"
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Mensaje"
 
@@ -3624,16 +3621,16 @@ msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
@@ -3641,27 +3638,27 @@ msgstr "/_Mensaje/_Responder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
@@ -3717,7 +3714,7 @@ msgstr "/_Mensaje/Es un correo _basura"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
@@ -3733,23 +3730,23 @@ msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
@@ -4000,39 +3997,39 @@ msgstr "_Texto"
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga clic en el icono para conectar."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga clic en el icono para desconectar."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "No se pudo combinar los mensajes seleccionados."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta a abrir"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4062,7 +4059,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4092,15 +4089,15 @@ msgstr ""
 "muestra esta ayuda y termina\n"
 "muestra la información de la versión y termina"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Opción sólo para Windows:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport nºpuerto"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "especificar el puerto IPC para órdenes remotas"
 
@@ -4137,27 +4134,27 @@ msgstr "Se llegó al final del mensaje. ¿Continuar desde el principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -4214,7 +4211,7 @@ msgstr "Seleccione «Verificar firma» para verificar"
 msgid "Select an action for the attached file:\n"
 msgstr "Seleccione una acción para el fichero adjunto:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Abrir _con..."
 
@@ -4222,7 +4219,7 @@ msgstr "Abrir _con..."
 msgid "_Display as text"
 msgstr "_Ver como texto"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
@@ -4239,7 +4236,8 @@ msgid "_Check signature"
 msgstr "_Verificar firma"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "No se puede guardar la parte del mensaje multipartes."
 
@@ -4247,11 +4245,11 @@ msgstr "No se puede guardar la parte del mensaje multipartes."
 msgid "Can't save the attachments."
 msgstr "No puedo guardar los adjuntos."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5986,20 +5984,20 @@ msgstr "Elementos visibles"
 msgid " Revert to default "
 msgstr " Valores por defecto "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Preferencias de filtrado"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "¿Está seguro de que quiere borrar la regla «%s»?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Borrar regla"
 
@@ -7137,7 +7135,7 @@ msgstr "No se encontró firma"
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de «%s»"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Firma válida"
 
@@ -7146,7 +7144,7 @@ msgstr "Firma válida"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma válida pero la clave para «%s» no es fiable"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Firma válida (clave no fiable)"
 
@@ -7182,7 +7180,7 @@ msgstr "La firma es válida pero la clave usada ha sido revocada"
 msgid "BAD signature from \"%s\""
 msgstr "Firma INVÁLIDA de «%s»"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Firma INVÁLIDA"
 
@@ -7660,19 +7658,29 @@ msgstr "se ha(n) filtrado %d mensaje(s)."
 msgid "file %s already exists\n"
 msgstr "el fichero %s ya existe\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Este mensaje está cifrado, pero falló su descifrado.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Abrir"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nombre de fichero"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no puede visualizarse.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7680,35 +7688,35 @@ msgstr ""
 "No se pudo mistrar el texto del cuerpo porque falló la escritura en el "
 "fichero temporal.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "_Guardar esta imagen como..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "R_esponder a esta dirección"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Añadir _remitente a la agenda..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7720,7 +7728,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "¿Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
@@ -7801,3 +7809,9 @@ msgstr ""
 #: plugin/attachment_tool/attachment_tool.c:272
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
+
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "No se puede guardar el mensaje en Salida."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "Message-ID generado: %s\n"
diff --git a/po/et.po b/po/et.po
index ff801d05..d8d08d53 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Loen kõigi kontode seaded...\n"
 
@@ -231,7 +231,7 @@ msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -526,12 +526,12 @@ msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada märgifaili\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda võtta kirja %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\n"
@@ -658,7 +658,7 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -666,29 +666,29 @@ msgstr ""
 "Mõned kirjutusaknad on avatud.\n"
 "Palun sulge kõik kirjutusaknad enne kontode redigeerimist."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Avan kontode redigeerimisakna...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Loon kausta vaate...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Loon kontode redigeerimisakna...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Kontode redigeerimine"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -696,42 +696,42 @@ msgstr ""
 "*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Redigeeri"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " Määra vaikimisi kontoks "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Kas te tõesti soovite kustutada kontot?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Tiitlita"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Kustuta konto"
 
@@ -832,7 +832,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Aadress"
@@ -851,8 +851,8 @@ msgstr "Vali aadressiraamatu kaust"
 msgid "Auto-registered address"
 msgstr "Registreeritud reeglid"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Fail"
 
@@ -873,11 +873,11 @@ msgstr "/_Fail/Uus _JPiloot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
@@ -893,21 +893,21 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
@@ -954,8 +954,8 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
@@ -968,13 +968,13 @@ msgstr "/_Tööriist/Impordi _LDIF fail"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
@@ -991,7 +991,7 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1048,17 +1048,17 @@ msgstr "E-Posti aadress"
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Pimekoopia:"
@@ -1272,7 +1272,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1328,442 +1328,442 @@ msgstr "Pruun"
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Ava"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Tööriist/Käivita"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Manused"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Pealkiri:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1771,41 +1771,43 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Kirja ei õnnestunud asetada väljunute kausta."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1815,12 +1817,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1829,15 +1831,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1846,104 +1848,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "Loodud Kirja-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Kuupäev"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1951,12 +1948,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1966,52 +1963,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2531,12 +2528,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -3409,16 +3406,16 @@ msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
@@ -3436,7 +3433,7 @@ msgstr "/_Fail/_Välju"
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
@@ -3662,42 +3659,42 @@ msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
@@ -3706,11 +3703,11 @@ msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Vaade/Kõik päised"
@@ -3719,7 +3716,7 @@ msgstr "/Vaade/Kõik päised"
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Kiri"
 
@@ -3759,16 +3756,16 @@ msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
@@ -3776,27 +3773,27 @@ msgstr "/_Kiri/_Vasta"
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
@@ -3857,7 +3854,7 @@ msgstr "/_Kiri/Võta _uued kirjad"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
@@ -3876,23 +3873,23 @@ msgstr "/_Tööriist/_Filtreeri kirjad"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
@@ -4157,42 +4154,42 @@ msgstr "Tekst"
 msgid "_None"
 msgstr "Mittemiski"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vali kaust"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4209,7 +4206,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4226,15 +4223,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4271,27 +4268,27 @@ msgstr "Jõudsin kirja lõppu; kas alustan algusest?"
 msgid "Search finished"
 msgstr "Otsimine lõpetatud"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Manused"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
@@ -4353,7 +4350,7 @@ msgstr "Selekteeri \"Kontrolli signatuuri\" kontrollimiseks"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/Ava kasutades..."
@@ -4363,7 +4360,7 @@ msgstr "/Ava kasutades..."
 msgid "_Display as text"
 msgstr "/Näita tekstina"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/Salveta kui..."
@@ -4381,7 +4378,8 @@ msgid "_Check signature"
 msgstr "/Kontrolli allkirja"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Ei saa salvestada seda osa mitmeosalisest kirjast."
 
@@ -4390,11 +4388,11 @@ msgstr "Ei saa salvestada seda osa mitmeosalisest kirjast."
 msgid "Can't save the attachments."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Ava kasutades"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6194,21 +6192,21 @@ msgstr "Näidatud elemendid"
 msgid " Revert to default "
 msgstr " Vaikimisi tagasi "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Filtri sättimine"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Kas te tõesti soovite seda reeglit kustutada?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Kustuta reegel"
 
@@ -7417,7 +7415,7 @@ msgstr "Allkirja ei leidunud"
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"-lt on hea allkiri"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Hea allkiri"
 
@@ -7426,7 +7424,7 @@ msgstr "Hea allkiri"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7463,7 +7461,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Halb allkiri \"%s\"-lt"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "HALB allkiri"
 
@@ -7957,60 +7955,70 @@ msgstr "kiri %d on juba salvestatud.\n"
 msgid "file %s already exists\n"
 msgstr "fail %s on juba olemas\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Loon tekstivaate...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/Ava"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Failinimi"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "kirja ei saanud\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Üldine aadress"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Üldine aadress"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8019,7 +8027,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8107,6 +8115,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Kirja ei õnnestunud asetada väljunute kausta."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "Loodud Kirja-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME Tüüp"
 
diff --git a/po/fi.po b/po/fi.po
index 138edad0..edb547f8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-03-07 23:37+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <foo@bar.example>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: UTF-8\n"
 "Plural-Forms: 2\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Luetaan kaikkien tilien kaikki asetukset...\n"
 
@@ -222,7 +222,7 @@ msgstr "virhe IMAP-komennon aikana: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei osaa muuntaa UTF-7 ->%s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei osaa muuntaa %s -> UTF-7\n"
@@ -516,12 +516,12 @@ msgstr "procmime_get_text_content(): Koodinmuunnos epäonnistui.\n"
 msgid "can't open mark file\n"
 msgstr "merkintätiedostoa ei saada avatuksi\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei voida noutaa viestiä %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Tulostuskomentorivi on kelvoton: ”%s”\n"
@@ -634,7 +634,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -642,27 +642,27 @@ msgstr ""
 "Joitakin viestinkirjoitusikkunoita on auki.\n"
 "Sulje kaikki kirjoitusikkunat ennen tilien muokkaamista."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Avataan tilinmuokkausikkuna...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Luodaan kansiopuuta. Odota..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Kansiopuun uudelleenrakennus epäonnistui."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Luodaan tilinmuokkausikkunaa...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Muokkaa tilejä"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -670,40 +670,40 @@ msgstr ""
 "Uudet viestit tarkistetaan tässä järjestyksessä. Valitse K-kenttä\n"
 "jos haluat viestit haettavan ”Nouda kaikki” -toiminnolla."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Palvelin"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " Aseta _oletustiliksi "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Haluatko varmasti poistaa tilin ”%s”?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Poista tili"
 
@@ -805,7 +805,7 @@ msgstr "Toiminnon käyttäjäparametri"
 msgid "Add Address to Book"
 msgstr "Lisää osoite osoitekirjaan"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Osoite"
@@ -823,8 +823,8 @@ msgstr "Valitse osoitekirjan kansio"
 msgid "Auto-registered address"
 msgstr "Poista osoitteet"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Tiedosto"
 
@@ -844,11 +844,11 @@ msgstr "/_Tiedosto/Uusi _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tiedosto/Uusi L_DAP-palvelin"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Tiedosto/---"
 
@@ -864,21 +864,21 @@ msgstr "/_Tiedosto/_Poista"
 msgid "/_File/_Save"
 msgstr "/_Tiedosto/_Tallenna"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Tiedosto/_Sulje"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Muokkaa"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Muokkaa/_Kopioi"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Muokkaa/L_iitä"
 
@@ -922,8 +922,8 @@ msgstr "/_Osoite/_Muokkaa"
 msgid "/_Address/_Delete"
 msgstr "/_Osoite/_Poista"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
@@ -935,13 +935,13 @@ msgstr "/T_yökalut/Tuo _LDIF-tiedosto"
 msgid "/_Tools/Import _CSV file"
 msgstr "/T_yökalut/Tuo _CSV-tiedosto"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Ohje"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Ohje/_Tietoja ohjelmasta"
 
@@ -958,7 +958,7 @@ msgid "/New _Folder"
 msgstr "/Uusi _kansio"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1012,17 +1012,17 @@ msgstr "Sähköpostiosoite"
 msgid "Search:"
 msgstr "Etsi:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopionsaaja:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Piilokopionsaaja:"
@@ -1226,7 +1226,7 @@ msgstr "Yleinen osoite"
 msgid "Personal address"
 msgstr "Oma osoite"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Huomautus"
 
@@ -1282,396 +1282,396 @@ msgstr "Ruskea"
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Avaa"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/L_isää..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Poista"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ominaisuudet..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Tiedosto/L_ähetä"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Tiedosto/Lähetä m_yöhemmin"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Tiedosto/_Tallenna luonnoskansioon"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Tiedosto/Tallenna _ja jatka muokkausta"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Tiedosto/L_iitä tiedosto"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Tiedosto/L_isää tiedosto"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Tiedosto/Lisää _allekirjoitus"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Tiedosto/Lisää _allekirjoitus"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Muokkaa/Per_u"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Muokkaa/_Tee uudelleen"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Muokkaa/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Muokkaa/_Leikkaa"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Muokkaa/Liitä l_ainauksena"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Muokkaa/Valitse _kaikki"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Muokkaa/Rivitä nykyinen ka_ppale"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Muokkaa/Rivitä _pitkät rivit"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Muokkaa/_Rivitä"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Näkymä"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Näkymä/Vastaan_ottaja"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Näkymä/K_opionsaaja"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Näkymä/P_iilokopionsaaja"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Näkymä/Vastaus_osoite"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Näkymä/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Näkymä/Aseta _seurantaryhmä"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Näkymä/_Viivain"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Näkymä/L_iite"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Näkymä/_Mukauta työkaluriviä..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Näkymä/_Merkistökoodaus"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Näkymä/_Merkistökoodaus/_Automaattinen"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Näkymä/_Merkistökoodaus/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Näkymä/_Merkistökoodaus/7-bittinen ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Näkymä/_Merkistökoodaus/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Näkymä/_Merkistökoodaus/Länsieurooppalainen (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Näkymä/_Merkistökoodaus/Länsieurooppalainen (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Näkymä/_Merkistökoodaus/Keskieurooppalainen (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Näkymä/_Merkistökoodaus/_Balttilainen (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Näkymä/_Merkistökoodaus/Balttilainen (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Näkymä/_Merkistökoodaus/Balttilainen (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kreikkalainen (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Näkymä/_Merkistökoodaus/Arabialainen (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Näkymä/_Merkistökoodaus/Arabialainen (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Näkymä/_Merkistökoodaus/Heprealainen (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Näkymä/_Merkistökoodaus/Heprealainen (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Näkymä/_Merkistökoodaus/Turkkilainen (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Näkymä/_Merkistökoodaus/Yksinkertaistettu kiinalainen (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Näkymä/_Merkistökoodaus/Yksinkertaistettu kiinalainen (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Näkymä/_Merkistökoodaus/Perinteinen kiinalainen (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Näkymä/_Merkistökoodaus/Korealainen (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Näkymä/_Merkistökoodaus/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Näkymä/_Merkistökoodaus/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/T_yökalut/_Osoitekirja"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/T_yökalut/_Aihio"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/T_yökalut/_Toiminnot"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/T_yökalut/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/T_yökalut/Muokkaa _ulkoisessa muokkaimessa"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/T_yökalut/PGP-_allekirjoita"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/T_yökalut/PGP-_salaa"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/T_yökalute/O_ikoluku"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/T_yökalut/Aseta oikoluku_kieli"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tiedostoa ei ole olemassa\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Tekstin osaa ei saada noudetuksi\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Lainausmerkinnän muotovirhe."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Vastaus- tai välitysviestin muotovirhe."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tiedostoa %s ei ole olemassa\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Tiedoston %s kokoa ei saada selville\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Tiedosto %s on tyhjä."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Kohdetta %s ei voi lukea."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Moniosaisen viestin osaa ei saa noudetuksi."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s – Kirjoita%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Vastaanottajaa ei ole annettu."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Tyhjä aihe"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Aihetta ei ole asetettu. Lähetetäänkä silti?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Liite puuttuu"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Liitettä ei ole. Lähetetäänkö liitteittä?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Tarkista vastaanottajat"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Lähetetäänkö viesti todella seuraaviin osoitteisiin?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Lähettäjä:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr " Lähetä "
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "vastaanottajaluetteloa ei saa noudetuksi."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1679,37 +1679,39 @@ msgstr ""
 "Lähtevää sähköpostitiliä ei ole määritetty.\n"
 "Valitse tili ennen lähettämistä."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Sattui virhe lähetettäessä viestiä vastaanottajalle %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Viestiä ei voitu tallentaa lähteneiden kansioon."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Valittuun avaintunnisteeseen ”%s” yhdistettyä avainta ei löytynyt."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Viestiä ei voi asettaa jonoon."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Viestiä ei voi asettaa jonoon."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Viestiä ei voi salata tai allekirjoittaa."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "tiedoston tilaa ei voi muuttaa\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1720,11 +1722,11 @@ msgstr ""
 "\n"
 "Lähetetäänkö muodossa %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Koodinmuunnosvirhe"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1737,15 +1739,15 @@ msgstr ""
 "\n"
 "Lähetetäänkö silti?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Rivin pituusrajoitus"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Piilokopion salaus"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1759,99 +1761,94 @@ msgstr ""
 "\n"
 "Lähetetäänkö silti?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "vanhaa viestiä ei voida poistaa\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "viedään viestiä jonoon...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "jonotuskansiota ei löydy\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "viestiä ei voida viedä jonoon\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Tiedostoa %s ei ole olemassa."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Tiedostoa %s ei voi avata."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "luotu viestitunniste: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Luodaan viestinkirjoitusikkunaa...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP-allekirjoita"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP-salaa"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datatyyppi"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Koko"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Kelvoton MIME-tyyppi"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole olemassa tai se on tyhjä."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Polku"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Ehtoa ei ole olemassa."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Avataan ulkoista ohjelmaa"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1863,12 +1860,12 @@ msgstr ""
 "Jos haluat käynnistää ohjelman, tallenna tiedosto jonnekin ja varmista, "
 "ettei se sisällä viruksia tai ole muuten pahantahtoinen."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ulkoisen muokkaimen komentorivillä on virhe: '%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1877,48 +1874,48 @@ msgstr ""
 "Ulkoinen muokkain on yhä käynnissä.\n"
 "Pakotetaanko lopettamaan prosessi (PID: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Mukauta työkaluriviä"
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Viestiä ei voi asettaa jonoon."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Valitse tiedostot"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Valitse tiedosto"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Tallenna viesti"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Viestiä on muokattu. Tallennetaanko se luonnoskansioon?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Sulje _tallentamatta"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Haluatko varmasti käyttää aihiota ”%s”?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Käytä aihiota"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "K_orvaa"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Lisää"
 
@@ -2417,12 +2414,12 @@ msgstr "Asetetaan kansion tietoja...\n"
 msgid "Setting folder info..."
 msgstr "Asetetaan kansion tietoja..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tutkitaan kansiota %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tutkitaan kansiota %s ..."
@@ -3267,15 +3264,15 @@ msgstr "/_Tiedosto/_Vie postit..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Tiedosto/Tyhjennä _roskakorit"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Tiedosto/Tallenna _nimellä..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Tiedosto/_Sivun asetukset..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Tiedosto/Tul_osta..."
 
@@ -3292,7 +3289,7 @@ msgstr "/_Tiedosto/_Lopeta"
 msgid "/_Edit/Select _thread"
 msgstr "/_Muokkaa/Valitse _säie"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Muokkaa/_Etsi nykyisestä viestistä..."
 
@@ -3510,35 +3507,35 @@ msgstr "/_Näkymä/_Siirry/Seuraava vä_rikoodattu viesti"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Näkymä/_Siirry/Toinen kansio..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Näkymä/_Merkistökoodaus/_Automaattitunnistus"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Näkymä/_Merkistökoodaus/Länsieurooppalainen (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (_Shift_JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Näkymä/_Merkistökoodaus/Perinteinen kiinalainen (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kiinalainen (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Näkymä/_Merkistökoodaus/Korealainen (ISO-2022-KR)"
 
@@ -3546,11 +3543,11 @@ msgstr "/_Näkymä/_Merkistökoodaus/Korealainen (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Näkymä/Avaa uuteen _ikkunaan"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Näkymä/Viestin lähdekoo_di"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Näkymä/K_aikki otsakkeet"
 
@@ -3558,7 +3555,7 @@ msgstr "/_Näkymä/K_aikki otsakkeet"
 msgid "/_View/_Update summary"
 msgstr "/_Näkymä/Päi_vitä yhteenveto"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/V_iesti"
 
@@ -3592,16 +3589,16 @@ msgstr "/V_iesti/Lähetä _jonossa olevat viestit"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/V_iesti/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/V_iesti/Kirjoita _uusi viesti"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/V_iesti/V_astaa"
 
@@ -3609,27 +3606,27 @@ msgstr "/V_iesti/V_astaa"
 msgid "/_Message/Repl_y to"
 msgstr "/V_iesti/V_astaa..."
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/V_iesti/V_astaa.../K_aikille"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/V_iesti/V_astaa.../_Lähettäjälle"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/V_iesti/V_astaa.../_Postilistalle"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/V_iesti/_Välitä"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/V_iesti/Välitä l_iitteenä"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/V_iesti/Ohjaa _uudelleen"
 
@@ -3685,7 +3682,7 @@ msgstr "/V_iesti/Merkitse _roskapostiksi"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/V_iesti/Merkitse _ei-roskapostiksi"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/V_iesti/_Muokkaa uudelleen"
 
@@ -3701,23 +3698,23 @@ msgstr "/T_yökalut/Suodata kansion kaikki viestit"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/T_yökalut/Suodata _valitut viestit"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/T_yökalut/Luo _suodatussääntö"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Automaattisesti"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Lähettäjästä"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Vastaanottajasta"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Aiheesta"
 
@@ -3968,39 +3965,39 @@ msgstr "_Teksti"
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Yhteyttä ei ole. Ota yhteys napsauttamalla kuvaketta."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Olet verkossa. Katkaise yhteys napsauttamalla kuvaketta."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Lopeta"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Lopetetaanko ohjelma?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Seuraavia viestejä ei voitu yhdistää."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Valitse avattava kansio"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Komentorivivalitsimet"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Käyttö: sylpheed [VALITSIN]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4030,7 +4027,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4059,15 +4056,15 @@ msgstr ""
 "näytä tämä ohje ja lopeta\n"
 "näytä versiotiedot ja lopeta"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Windows-kohtainen valitsin:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport porttino"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "määritä IPC-etäkomentojen portti"
 
@@ -4104,27 +4101,27 @@ msgstr "Viestin loppu saavutettu, jatketaanko alusta?"
 msgid "Search finished"
 msgstr "Haku päättyi"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/T_yökalut/_Lisää lähettäjä osoitekirjaan"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Luodaan viestinäkymää...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Teksti"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Viestinäkymä – Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Tiedostoa ”%s” ei voi tallentaa."
@@ -4181,7 +4178,7 @@ msgstr "Tarkista valitsemalla ”Tarkista allekirjoitus”"
 msgid "Select an action for the attached file:\n"
 msgstr "Valitse, mitä liitetiedostolla tehdään:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Avaa _ohjelmalla..."
 
@@ -4189,7 +4186,7 @@ msgstr "Avaa _ohjelmalla..."
 msgid "_Display as text"
 msgstr "Näytä _tekstinä"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Tallenna nimellä..."
 
@@ -4206,7 +4203,8 @@ msgid "_Check signature"
 msgstr "Tarkista _allekirjoitus"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Ei voida tallentaa moniosaisen viestin osaa."
 
@@ -4214,11 +4212,11 @@ msgstr "Ei voida tallentaa moniosaisen viestin osaa."
 msgid "Can't save the attachments."
 msgstr "Liitteitä ei voida tallentaa."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Avaa ohjelmalla"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5949,20 +5947,20 @@ msgstr "Näytetyt sarakkeet"
 msgid " Revert to default "
 msgstr " Palaa oletukseen "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Suotimen asetukset"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Haluatko varmasti poistaa säännön ”%s”?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Poista sääntö"
 
@@ -7099,7 +7097,7 @@ msgstr "Allekirjoitusta ei löytynyt"
 msgid "Good signature from \"%s\""
 msgstr "Kelvollinen allekirjoitus osoitteesta ”%s”"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Kelvollinen allekirjoitus"
 
@@ -7108,7 +7106,7 @@ msgstr "Kelvollinen allekirjoitus"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Kelvollinen allekirjoitus mutta lähettäjän ”%s” avain ei ole luotettu"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Kelvollinen allekirjoitus (ei-luotettu avain)"
 
@@ -7148,7 +7146,7 @@ msgstr "Allekirjoitus kelvollinen mutta allekirjoitusavain on peruutettu"
 msgid "BAD signature from \"%s\""
 msgstr "KELVOTON allekirjoitus lähettäjältä ”%s”"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "KELVOTON allekirjoitus"
 
@@ -7626,19 +7624,29 @@ msgstr "%d viesti(ä) on suodatettu."
 msgid "file %s already exists\n"
 msgstr "tiedosto %s on jo olemassa\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Luodaan tekstinäkymää...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Viesti on salattu, mutta salauksen purku epäonnistui.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Avaa"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Tiedostonimi"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Tätä viestiä ei voi näyttää.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7646,35 +7654,35 @@ msgstr ""
 "Viestin runkoa ei voi näyttää, koska kirjoittaminen väliaikaistiedostoon "
 "epäonnistui.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Tallenna tämä kuva _nimellä..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Kirjoita _uusi viesti"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "Vastaa t_ähän osoitteeseen"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Lisää _osoitekirjaan..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Kopioi tämä _osoite"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Avaa _selaimeen"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Kopioi tämä _linkki"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7686,7 +7694,7 @@ msgstr ""
 "annetusta (%s).\n"
 "Avataanko silti?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Varoitus valeosoitteesta"
 
@@ -7767,3 +7775,9 @@ msgstr ""
 #: plugin/attachment_tool/attachment_tool.c:272
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
+
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Viestiä ei voitu tallentaa lähteneiden kansioon."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "luotu viestitunniste: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 75f23750..63e0d0bd 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-28 00:22+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
@@ -231,7 +231,7 @@ msgstr "erreur avec la commande IMAP : CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -532,12 +532,12 @@ msgstr "procmime_get_text_content() : la conversion de code a échoué.\n"
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de récupérer le message %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\n"
@@ -664,7 +664,7 @@ msgstr ""
 "programme. Si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -673,27 +673,27 @@ msgstr ""
 "Veuillez fermer toutes les fenêtres de composition avant de configurer les "
 "comptes."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Ouverture de la fenêtre de configuration de compte...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Création de la vue des dossiers..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "La construction de l'arborescence a échoué."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Création de la fenêtre de configuration de compte...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Édition des comptes"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -702,40 +702,40 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nom"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Serveur"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Éditer"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "_Définir comme compte par défaut"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte « %s » ?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
@@ -838,7 +838,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresses"
@@ -856,8 +856,8 @@ msgstr "Choisissez un dossier"
 msgid "Auto-registered address"
 msgstr "Adresses enregistrées automatiquement"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Fichier"
 
@@ -877,11 +877,11 @@ msgstr "/_Fichier/Nouveau carnet _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
@@ -897,21 +897,21 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
@@ -955,8 +955,8 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Outils"
 
@@ -968,13 +968,13 @@ msgstr "/_Outils/Importer un fichier _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
@@ -991,7 +991,7 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1045,17 +1045,17 @@ msgstr "Adresse électronique"
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Copie discrète :"
@@ -1266,7 +1266,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Information"
 
@@ -1322,398 +1322,398 @@ msgstr "Brun"
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Ouvrir"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichier/_Ajouter la signature"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Affichage/_Faire suivre"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Outils/_Notification sur la disposition"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Outils/_Vérifier l'orthographe"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 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:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Pièce jointe absente"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Il n'y a pas de pièce jointe. Envoyer sans pièce jointe ?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Vérification des destinataires"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1721,37 +1721,39 @@ 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:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-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:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Impossible de signer le message."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Impossible de crypter le message."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Impossible de crypter ou signer le message."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1762,11 +1764,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1779,15 +1781,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1801,99 +1803,94 @@ msgstr ""
 "\n"
 "Envoyer quand même ?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "Message-ID créé : %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Type de données"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Le fichier n'existe pas."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Ouverture du fichier exécutable"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1905,12 +1902,12 @@ msgstr ""
 "Vous pouvez l'enregistrer quelque part pour le lancer vous-même, mais prenez "
 "les précautions d'usage (anti-virus, etc.)."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1919,50 +1916,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 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:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2463,12 +2460,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -3331,15 +3328,15 @@ msgstr "/_Fichier/_Exporter du courrier..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Fichier/_Mise en page..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
@@ -3356,7 +3353,7 @@ msgstr "/_Fichier/_Quitter"
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
@@ -3575,35 +3572,35 @@ msgstr "/_Affichage/_Aller à/_Coloré suivant"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
@@ -3611,11 +3608,11 @@ msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/Ouv_rir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Affichage/Afficher tous le_s en-têtes"
 
@@ -3623,7 +3620,7 @@ msgstr "/_Affichage/Afficher tous le_s en-têtes"
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Message"
 
@@ -3657,16 +3654,16 @@ msgstr "/_Message/En_voyer les messages en file d'attente"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
@@ -3674,27 +3671,27 @@ msgstr "/_Message/_Répondre"
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
@@ -3750,7 +3747,7 @@ msgstr "/_Message/Marquer comme indésira_ble"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme acc_eptable"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réé_diter"
 
@@ -3766,23 +3763,23 @@ msgstr "/_Outils/_Filtrer les messages du dossier"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le _sujet"
 
@@ -4032,39 +4029,39 @@ msgstr "_Textes seulement"
 msgid "_None"
 msgstr "_Pas de barre d'outils"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous êtes déconnecté. Cliquer sur l'icône pour vous connecter."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous êtes connecté. Cliquer sur l'icône pour vous déconnecter."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Les messages sélectionnés ne peuvent pas être combinés"
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Choix d'un dossier à ouvrir"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4094,7 +4091,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4125,15 +4122,15 @@ msgstr ""
 "afficher l'aide-mémoire et quitter\n"
 "afficher les informations de version et quitter"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Option pour Windows uniquement:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "spécifier le port pour les commandes IPC distantes"
 
@@ -4170,27 +4167,27 @@ msgstr "Fin de message atteint, reprendre depuis le début ?"
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Création de la vue message...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Texte"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -4247,7 +4244,7 @@ msgstr "Sélectionner « Vérifier la  signature » pour vérifier"
 msgid "Select an action for the attached file:\n"
 msgstr "Choisissez une action pour le fichier joint suivant :\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Ouvrir _avec..."
 
@@ -4255,7 +4252,7 @@ msgstr "Ouvrir _avec..."
 msgid "_Display as text"
 msgstr "Afficher comme du _texte"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Enregistrer so_us..."
 
@@ -4272,7 +4269,8 @@ msgid "_Check signature"
 msgstr "_Vérifier la signature"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Impossible d'enregistrer une pièce d'un message multipart"
 
@@ -4280,11 +4278,11 @@ msgstr "Impossible d'enregistrer une pièce d'un message multipart"
 msgid "Can't save the attachments."
 msgstr "Impossible d'enregistrer les pièces jointes."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6034,20 +6032,20 @@ msgstr "Éléments affichés"
 msgid " Revert to default "
 msgstr " Revenir aux valeurs par défaut "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Règles de filtrage"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Voulez-vous vraiment supprimer la règle '%s'?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Supprimer une règle"
 
@@ -7190,7 +7188,7 @@ msgstr "Pas de signature trouvée"
 msgid "Good signature from \"%s\""
 msgstr "Signature correcte de \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Signature correcte"
 
@@ -7199,7 +7197,7 @@ msgstr "Signature correcte"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Signature correcte mais la clé pour \"%s\" n'est pas de confiance"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Signature correcte (clé suspecte)"
 
@@ -7237,7 +7235,7 @@ msgstr "La signature est correcte mais la clé de signature a été révoquée"
 msgid "BAD signature from \"%s\""
 msgstr "Mauvaise signature de \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "MAUVAISE signature"
 
@@ -7718,19 +7716,29 @@ msgstr "%d message(s) ont été filtré(s)."
 msgid "file %s already exists\n"
 msgstr "le fichier %s existe déjà\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Création de la vue texte...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Ce message est chiffré mais le déchiffrement a échoué \n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Ouvrir"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nom du fichier"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Impossible d'afficher ce message.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7738,35 +7746,35 @@ msgstr ""
 "Le corps du texte ne peut pas être affiché car la création du fichier "
 "temporaire a échoué.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "Ré_pondre à cette adresse"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7778,7 +7786,7 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'ouvrir ?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
@@ -7860,6 +7868,13 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr ""
+#~ "Impossible d'enregistrer de message dans la boîte de messages envoyés"
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "Message-ID créé : %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Type MIME"
 
diff --git a/po/gl.po b/po/gl.po
index 10dcc667..1b24edb8 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuración de cada conta...\n"
 
@@ -230,7 +230,7 @@ msgstr "erro no comando imap: EXPUNGE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -523,12 +523,12 @@ msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\n"
@@ -656,7 +656,7 @@ msgstr ""
 "con este programa; en caso contrario, escriba a  Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -664,29 +664,29 @@ msgstr ""
 "Hai Fiestras de composición abertas.\n"
 "Peche todas as fiestras de composición antes de editar as contas."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Abrindo fiestra de edición de conta...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Creando vista de carpeta...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Creando fiestra de edición de conta...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -694,42 +694,42 @@ msgstr ""
 "A orde de comprobación de mensaxes será este. Marque as casilas\n"
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " conta por defecto "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quere borrar esta conta?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Sen título"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Borrar conta"
 
@@ -830,7 +830,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Enderezo"
@@ -849,8 +849,8 @@ msgstr "Seleccionar carpeta da axenda"
 msgid "Auto-registered address"
 msgstr "Regas rexistradas"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Ficheiro"
 
@@ -871,11 +871,11 @@ msgstr "/_Ficheiro/Novo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
@@ -891,21 +891,21 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -952,8 +952,8 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
@@ -966,13 +966,13 @@ msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
@@ -989,7 +989,7 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1046,17 +1046,17 @@ msgstr "Enderezo e-mail"
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1271,7 +1271,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1327,442 +1327,442 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Abrir"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, 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:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adxuntos"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1770,40 +1770,42 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Non se pode gardar a mensaxe en Saida."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1814,12 +1816,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1828,15 +1830,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1845,103 +1847,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "Message-ID generado: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1949,12 +1946,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1964,52 +1961,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2529,12 +2526,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3410,16 +3407,16 @@ msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
@@ -3437,7 +3434,7 @@ msgstr "/_Ficheiro/Sai_r"
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
@@ -3662,42 +3659,42 @@ msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
@@ -3706,11 +3703,11 @@ msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas as cabeceiras"
@@ -3719,7 +3716,7 @@ msgstr "/_Ver/Todas as cabeceiras"
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
@@ -3759,16 +3756,16 @@ msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
@@ -3776,27 +3773,27 @@ msgstr "/_Mensaxe/_Respostar"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
@@ -3857,7 +3854,7 @@ msgstr "/_Mensaxe/Rec_ibir correo novo"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
@@ -3876,23 +3873,23 @@ msgstr "/_Ferramentas/_Filtrar Mensaxes"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
@@ -4159,42 +4156,42 @@ msgstr "Texto"
 msgid "_None"
 msgstr "Ningún"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4211,7 +4208,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4228,15 +4225,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4273,27 +4270,27 @@ msgstr "Chegóuse ó final da mensaxe. ¿Seguir dende o principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Adxuntos"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
@@ -4355,7 +4352,7 @@ msgstr "Seleccione \"Verificar sinatura\" para verificar"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/Abrir _con..."
@@ -4365,7 +4362,7 @@ msgstr "/Abrir _con..."
 msgid "_Display as text"
 msgstr "/_Ver como texto"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/_Gardar como..."
@@ -4383,7 +4380,8 @@ msgid "_Check signature"
 msgstr "/_Verificar sinatura"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Non se pode gardar a parte da mensaxe multipartes."
 
@@ -4392,11 +4390,11 @@ msgstr "Non se pode gardar a parte da mensaxe multipartes."
 msgid "Can't save the attachments."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6195,21 +6193,21 @@ msgstr "Elementos visibles"
 msgid " Revert to default "
 msgstr " Valores por defecto "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Preferencias de filtrado"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "¿Quere borrar realmente esta regra?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Borrar regra"
 
@@ -7416,7 +7414,7 @@ msgstr "Non se atopou sinatura"
 msgid "Good signature from \"%s\""
 msgstr "Sinatura válida de \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Sinatura válida"
 
@@ -7425,7 +7423,7 @@ msgstr "Sinatura válida"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7462,7 +7460,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Sinatura INVÁLIDA"
 
@@ -7956,60 +7954,70 @@ msgstr "o mensaxe %d xa esta en caché.\n"
 msgid "file %s already exists\n"
 msgstr "o ficheiro %s xa existe\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Abrir"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nome de ficheiro"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "unha mensaxe non será recibido\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Enderezo común"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo común"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8018,7 +8026,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8106,6 +8114,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Non se pode gardar a mensaxe en Saida."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "Message-ID generado: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Tipo MIME"
 
diff --git a/po/hr.po b/po/hr.po
index bc49e3dd..82d6a206 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Čitam konfiguracije za svaki račun...\n"
 
@@ -232,7 +232,7 @@ msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -529,12 +529,12 @@ msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilježenu datoteku\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -663,7 +663,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -671,29 +671,29 @@ msgstr ""
 "Neki prozori za pisanje pisma su otvoreni.\n"
 "Molim, zatvorite sve prozore prije uređivanja računa."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Otvaram prozor za uređivanje računa...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Stvaram prozor za uređivanje računa...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Uredi račune"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -701,42 +701,42 @@ msgstr ""
 "Nove poruke biti će provjerene ovim redom. Označite pod\n"
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Uredi"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " Postavi kao uobičajeni račun "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Neimenovano"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Obriši račun"
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
@@ -853,8 +853,8 @@ msgstr "Odaberite spis adresara"
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Datoteka"
 
@@ -876,11 +876,11 @@ msgstr "/_Datoteka/Novi _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -896,21 +896,21 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
@@ -957,8 +957,8 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Alati"
 
@@ -971,13 +971,13 @@ msgstr "/_Datoteka/Unesi _LDIF datoteku"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
@@ -994,7 +994,7 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1051,17 +1051,17 @@ msgstr "E-mail adresa"
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1269,7 +1269,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1325,452 +1325,452 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otvori"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u spis _nedovršeno"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Priloži datoteku"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:604
+#: src/compose.c:605
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Sažmi _poglavlje"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:614
+#: src/compose.c:615
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:615
+#: src/compose.c:616
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/_Pregled"
 
-#: src/compose.c:616
+#: src/compose.c:617
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Poruka/P_roslijedi"
 
-#: src/compose.c:621
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:623
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:715
+#: src/compose.c:716
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Izvrši"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prilog"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1778,40 +1778,42 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-msgid "Can't save the message to outbox."
-msgstr "Ne mogu snimiti poruku u spis poslano."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1819,12 +1821,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1833,15 +1835,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1850,105 +1852,100 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "generiran ID-poruke: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1956,12 +1953,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1971,53 +1968,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2540,12 +2537,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -3433,16 +3430,16 @@ msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Is_piši..."
 
@@ -3461,7 +3458,7 @@ msgstr "/_Datoteka/I_zlaz"
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uredi/P_ronađi u poruci"
@@ -3730,42 +3727,42 @@ msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
@@ -3774,12 +3771,12 @@ msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
@@ -3789,7 +3786,7 @@ msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Poruka"
 
@@ -3830,16 +3827,16 @@ msgstr "/_Pošta/Pošalji _odložene poruke"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
@@ -3848,31 +3845,31 @@ msgstr "/_Pošta/O_dgovori"
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
@@ -3934,7 +3931,7 @@ msgstr "/_Pošta/Primi novu _poštu"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
@@ -3953,27 +3950,27 @@ msgstr "/_Održavanje/_Filtriraj poštu"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
@@ -4250,42 +4247,42 @@ msgstr "Tekst"
 msgid "_None"
 msgstr "Ništa"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite spis"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4302,7 +4299,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4319,15 +4316,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4364,29 +4361,29 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Potraga završena"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 #, fuzzy
 msgid "Attachments"
 msgstr "Prilog"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
@@ -4448,7 +4445,7 @@ msgstr "Odaberite \"Provjeri potpis\" za provjeru"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/Otvori _s..."
@@ -4458,7 +4455,7 @@ msgstr "/Otvori _s..."
 msgid "_Display as text"
 msgstr "/Prikaži kao _tekst"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/S_premi kao"
@@ -4476,7 +4473,8 @@ msgid "_Check signature"
 msgstr "/Pro_vjeri potpis"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Ne mogu spremiti dio višedjelne poruke"
 
@@ -4485,11 +4483,11 @@ msgstr "Ne mogu spremiti dio višedjelne poruke"
 msgid "Can't save the attachments."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Otvori s"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6281,21 +6279,21 @@ msgstr "Prikazane pojedinosti"
 msgid " Revert to default "
 msgstr " Vrati na uobičajeno "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Postavke filtera"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Uistinu obrisati pravilo?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
@@ -7509,7 +7507,7 @@ msgstr "Nema potpisa"
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Dobar potpis"
 
@@ -7518,7 +7516,7 @@ msgstr "Dobar potpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7555,7 +7553,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
@@ -8061,59 +8059,69 @@ msgstr "poruka %d već je prihvaćena.\n"
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Kreiram pregled teksta...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Otvori"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Ime datoteke"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8122,7 +8130,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8209,6 +8217,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Ne mogu snimiti poruku u spis poslano."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "generiran ID-poruke: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME tip"
 
diff --git a/po/hu.po b/po/hu.po
index 7e316d67..e87d04b6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2010-02-13 14:38+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Beállítások beolvasása az összes fiókhoz...\n"
 
@@ -223,7 +223,7 @@ msgstr "hiba az IMAP parancs közben: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 msgid "can't open mark file\n"
 msgstr "A kijelölt fájl nem nyitható meg\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d levél letöltése nem sikerült\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\n"
@@ -655,7 +655,7 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -663,27 +663,27 @@ msgstr ""
 "Néhány szerkesztő ablak nyitva van.\n"
 "Zárjon be minden szerkesztő ablakot a fiókok módosítása előtt."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Fiókok szerkesztőablakának megnyitása...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Mappa nézet létrehozása. Kérem, várjon..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "A mappafa felépítése nem sikerült."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Fiókok szerkesztőablakának létrehozása...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Fiókok szerkesztése"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -692,40 +692,40 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Név"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Szerver"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " Alapértelmezett hozzá_férésként beállít "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tényleg törölni szeretné '%s' fiókot?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Névtelen)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Fiók törlése"
 
@@ -829,7 +829,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Cím"
@@ -847,8 +847,8 @@ msgstr "Címjegyzék mappa választás"
 msgid "Auto-registered address"
 msgstr "Auto-regisztrált cím"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Fájl"
 
@@ -868,11 +868,11 @@ msgstr "/_Fájl/Új _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
@@ -888,21 +888,21 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/S_zerkesztés/_Másolás"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
@@ -949,8 +949,8 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
@@ -962,13 +962,13 @@ msgstr "/_Eszközök/_LDIF fájl importálása"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
@@ -985,7 +985,7 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1039,17 +1039,17 @@ msgstr "Email cím"
 msgid "Search:"
 msgstr "Keresés:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Titkos másolat:"
@@ -1254,7 +1254,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1310,396 +1310,396 @@ msgstr "Barna"
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Megnyitás"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Küldés"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Fájl/Kü_ldés később"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fájl/Mentés a _Vázlatok mappába"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fájl/Mentés és _szerkesztésben marad"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Fájl/Aláírás csa_tolása"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/S_zerkesztés/_Visszavonás"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/S_zerkesztés/_Ismétlés"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/S_zerkesztés/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/S_zerkesztés/_Kivágás"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/S_zerkesztés/Beillesztés idé_zetként"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/S_zerkesztés/Mi_ndet kijelöli"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/S_zerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/S_zerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/S_zerkesztés/A_utomata tördelés"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Nézet/_Válaszcím"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Nézet/Vá_laszcikk-cím"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/C_satolás"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Nézet/Es_zközsáv testreszabása..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Nézet/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Műveletek"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Eszközök/Szerkesztés _külső programmal"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Eszközök/Request _disposition ntoification"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/PGP _Aláírás"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Eszközök/_Helyesírásellenőrzés"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Nincs csatolva semmi"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nincs csatolva semmi. Elküldi csatolások nélkül?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Címzettek ellenőrzése"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Tényleg elküldi ezt a levelet a következő címekre?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Küldés"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,39 +1707,41 @@ msgstr ""
 "Nincs megadva fiók a levél küldéshez.\n"
 "Válasszon ki egy fiókot küldés előtt!"
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel %s-n{ae}k küldendő levél küldésekor."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "A levél nem menthető a kimenő mappába."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem található hozzárendelt kulcs ehhez a kiválasztott kulcs azonosítóhoz: `%"
 "s'."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "A levelet nem sikerült aláírni."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "A levelet nem sikerült titkosítani."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "A levelet nem sikerült titkosítani vagy aláírni."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1750,11 +1752,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1767,15 +1769,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1790,101 +1792,96 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "generált Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dátum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Futtatható fájl megnyitása"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1896,12 +1893,12 @@ msgstr ""
 "Ha futtatni szeretné, mentse el valahová, és győződjön meg róla, hogy nem "
 "egy vírus vagy más kártékony program."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1910,48 +1907,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 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:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2451,12 +2448,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -3305,15 +3302,15 @@ msgstr "/_Fájl/L_evéladatok exportálása..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Fájl/_Oldalbeállítás..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
@@ -3330,7 +3327,7 @@ msgstr "/_Fájl/Ki_lépés"
 msgid "/_Edit/Select _thread"
 msgstr "/S_zerkesztés/S_zál kiválasztása"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/S_zerkesztés/_Keresés az aktuális levélben..."
 
@@ -3547,35 +3544,35 @@ msgstr "/_Nézet/_Ugrás/_Következő címkézett levélhez"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
@@ -3583,11 +3580,11 @@ msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Összes fejléc"
 
@@ -3595,7 +3592,7 @@ msgstr "/_Nézet/_Összes fejléc"
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Levél"
 
@@ -3629,16 +3626,16 @@ msgstr "/_Levél/_Levelek küldése a Várakozó sorból"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Levél/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Levél/Ú_j levél szerkesztése"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Levél/_Válasz"
 
@@ -3646,27 +3643,27 @@ msgstr "/_Levél/_Válasz"
 msgid "/_Message/Repl_y to"
 msgstr "/_Levél/Válasz _másnak"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Levél/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Levél/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Levél/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Levél/_Továbbítás"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Levél/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Levél/Át_irányít"
 
@@ -3724,7 +3721,7 @@ msgstr "/_Levél/Levéls_zemétként beállítás"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Levél/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Levél/Újrasz_erkesztés"
 
@@ -3740,23 +3737,23 @@ msgstr "/_Eszközök/Össz_es levél szűrése a mappában"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott levelek szűrése"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
@@ -4008,40 +4005,40 @@ msgstr "S_zöveg"
 msgid "_None"
 msgstr "S_emmi"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Ön kapcsolat nélküli módban van. Kattintson az ikonra a kapcsolódáshoz."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Ön kapcsolódva van. Kattintson az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Megnyitandó mappa kiválasztása"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4071,7 +4068,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4101,15 +4098,15 @@ msgstr ""
 "megjeleníti ezt a súgót, majd kilép\n"
 "kiírja a verzió információkat, majd kilép"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portszám      IPC távoli parancsok portjának megadása"
@@ -4147,27 +4144,27 @@ msgstr "A levél végére értem; folytassam az elejéről?"
 msgid "Search finished"
 msgstr "Keresés befejeződött"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Eszközök/Küldő hozzáadása a cím_jegyzékhez"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Levélnézet létrehozása...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Csatolások"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Levélnézet - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
@@ -4225,7 +4222,7 @@ msgstr ""
 msgid "Select an action for the attached file:\n"
 msgstr "Válasszon egy műveletet a csatolt fájlnak:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Megnyitás máss_al..."
 
@@ -4233,7 +4230,7 @@ msgstr "Megnyitás máss_al..."
 msgid "_Display as text"
 msgstr "Megjelenítés _szövegként"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Menté_s másként..."
 
@@ -4250,7 +4247,8 @@ msgid "_Check signature"
 msgstr "Digitális aláírás _ellenőrzése"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Egy többrészes levél egy darabja nem menthető."
 
@@ -4258,11 +4256,11 @@ msgstr "Egy többrészes levél egy darabja nem menthető."
 msgid "Can't save the attachments."
 msgstr "A csatolás(ok)at nem lehet elmenteni."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Megnyitás mint"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6009,20 +6007,20 @@ msgstr "Megjelenített elemek"
 msgid " Revert to default "
 msgstr " Alapértelmezettre visszaállít"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Szűrő beállítások"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Bakapcsolva"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Tényleg törölni szeretné a(z) '%s' szabályt?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Szabály törlése"
 
@@ -7162,7 +7160,7 @@ msgstr "Nem található digitális aláírás"
 msgid "Good signature from \"%s\""
 msgstr "Jó digitális aláírás \"%s\"-tól/től"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Jó digitális aláírás"
 
@@ -7171,7 +7169,7 @@ msgstr "Jó digitális aláírás"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Érvényes aláírás, de a(z) \"%s\" kulcs nem megbízható"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Érvényes aláírás (megbízhatatlan kulcs)"
 
@@ -7207,7 +7205,7 @@ msgstr "Érvényes aláírás, de az aláíró kulcs vissza lett vonva"
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" digitális aláírás ROSSZ"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "ROSSZ digitális aláírás"
 
@@ -7688,19 +7686,29 @@ msgstr "%d levél szűrése megtörtént."
 msgid "file %s already exists\n"
 msgstr "%s fájl már létezik\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Szövegnézet létrehozása...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "A levél titkosított, és nem sikerült visszafejteni.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Megnyitás"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Fájlnév"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Ez a levél nem jeleníthető meg.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7708,36 +7716,36 @@ msgstr ""
 "A szövegtest nem jeleníthető meg, mert az ideiglenes fájl írása nem "
 "sikerült.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Ú_j levél írása"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Hozzáadás a _címjegyzékhez..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "M_egnyitás webböngészővel"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "A _hivatkozás másolása"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7749,7 +7757,7 @@ msgstr ""
 "látható URL-től (%s).\n"
 "Ennek ellenére megnyitja?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
@@ -7835,5 +7843,11 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "A levél nem menthető a kimenő mappába."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "generált Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME típus"
diff --git a/po/it.po b/po/it.po
index d671d024..8e7df826 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
 
@@ -223,7 +223,7 @@ msgstr "errore durante il comando imap: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\n"
@@ -654,7 +654,7 @@ msgstr ""
 "insieme a questo programma; in caso contrario, scrivete alla Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -662,29 +662,29 @@ msgstr ""
 "Alcune finestre di composizione sono aperte.\n"
 "Chiudere tutte le finestre di composizione prima di modificare gli account."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Apertura della finestra di modifica dell'account...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Creazione della finestra di modifica dell'account...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Modifica degli account"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -693,40 +693,40 @@ msgstr ""
 "nella\n"
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr " Modifica "
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " _Imposta come account predefinito "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Eliminare l'account «%s»?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Senza titolo)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Elimina account"
 
@@ -829,7 +829,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Indirizzo"
@@ -848,8 +848,8 @@ msgstr "Selezione della cartella della rubrica"
 msgid "Auto-registered address"
 msgstr "Modelli registrati"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_File"
 
@@ -869,11 +869,11 @@ msgstr "/_File/Nuovo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_File/---"
 
@@ -889,21 +889,21 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
@@ -950,8 +950,8 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
@@ -963,13 +963,13 @@ msgstr "/S_trumenti/Importa file _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
@@ -986,7 +986,7 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1040,17 +1040,17 @@ msgstr "Indirizzo e-mail"
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1257,7 +1257,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1313,399 +1313,399 @@ msgstr "Marrone"
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Apri"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_File/A_ggiungi firma"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visualizza/Per_sonalizza barra degli strumenti"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (_Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/C_ifratura PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/S_trumenti/_Controllo ortografico"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Allegati"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1713,42 +1713,44 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-msgid "Can't save the message to outbox."
-msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1760,11 +1762,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1778,15 +1780,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1800,101 +1802,96 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "generato l'ID-messaggio: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Apertura file eseguibile"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1906,12 +1903,12 @@ msgstr ""
 "Se volete lanciarlo, salvatelo da qualche parte e assicuratevi che non sia "
 "un virus o qualcosa di simile a un programma malizioso."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1920,48 +1917,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2473,12 +2470,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -3343,15 +3340,15 @@ msgstr "/_File/Esp_orta file mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_File/I_mposta pagina..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
@@ -3368,7 +3365,7 @@ msgstr "/_File/_Esci"
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
@@ -3590,35 +3587,35 @@ msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
@@ -3626,11 +3623,11 @@ msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
@@ -3638,7 +3635,7 @@ msgstr "/_Visualizza/Tutte le intesta_zioni"
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/M_essaggio"
 
@@ -3673,16 +3670,16 @@ msgstr "/M_essaggio/Invia messa_ggi accodati"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
@@ -3690,27 +3687,27 @@ msgstr "/M_essaggio/_Rispondi"
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
@@ -3768,7 +3765,7 @@ msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
@@ -3784,23 +3781,23 @@ msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
@@ -4053,40 +4050,40 @@ msgstr "_Testo"
 msgid "_None"
 msgstr "_Niente"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selezione della cartella"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4116,7 +4113,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4146,15 +4143,15 @@ msgstr ""
 "mostra questo aiuto ed esce\n"
 "mostra informazioni sulla versione ed esce"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
@@ -4192,27 +4189,27 @@ msgstr "Ho raggiunto la fine del messaggio; continuo dall'inizio?"
 msgid "Search finished"
 msgstr "Ricerca terminata"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Testo"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Allegati"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
@@ -4269,7 +4266,7 @@ msgstr "Seleziona «Controlla firma» per controllare"
 msgid "Select an action for the attached file:\n"
 msgstr "Selezionare un'azione per il file allegato:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "A_pri con..."
 
@@ -4277,7 +4274,7 @@ msgstr "A_pri con..."
 msgid "_Display as text"
 msgstr "_Mostra come testo"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Sa_lva come..."
 
@@ -4294,7 +4291,8 @@ msgid "_Check signature"
 msgstr "_Controlla firma"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Impossibile salvare parte del messaggio composto."
 
@@ -4302,11 +4300,11 @@ msgstr "Impossibile salvare parte del messaggio composto."
 msgid "Can't save the attachments."
 msgstr "Impossibile salvare gli allegati."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Apri con"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6066,20 +6064,20 @@ msgstr "Voci visualizzate"
 msgid " Revert to default "
 msgstr " Ritorna al predefinito "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Impostazioni filtro"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Eliminare la regola «%s»?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Elimina la regola"
 
@@ -7239,7 +7237,7 @@ msgstr "Firma non trovata"
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da «%s»"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Firma corretta"
 
@@ -7248,7 +7246,7 @@ msgstr "Firma corretta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma valida, ma la chiave per «%s» non è fidata"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Firma valida (chiave non fidata)"
 
@@ -7284,7 +7282,7 @@ msgstr "Firma valida, ma la firma della chiave è stata revocata"
 msgid "BAD signature from \"%s\""
 msgstr "Firma DIFETTOSA da «%s»"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Firma DIFETTOSA"
 
@@ -7779,19 +7777,29 @@ msgstr "sono stati filtrati %d messaggi(o)."
 msgid "file %s already exists\n"
 msgstr "il file %s esiste già\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Creazione della vista del testo...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Questo messaggio è cifrato, ma la decifrazione è fallita.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Apri"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nome del file"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Questo messaggio non può essere visualizzato.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7799,36 +7807,36 @@ msgstr ""
 "Il corpo del testo non può essere mostrato perché la scrittura sul file "
 "temporaneo è fallita \n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Componi un n_uovo messaggio"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7841,7 +7849,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
@@ -7923,6 +7931,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "generato l'ID-messaggio: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Tipo MIME"
 
diff --git a/po/ja.po b/po/ja.po
index f510dad5..556add45 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "すべてのアカウント毎の設定を読み込み中...\n"
 
@@ -221,7 +221,7 @@ msgstr "imap コマンド中のエラー: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -519,12 +519,12 @@ msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 msgid "can't open mark file\n"
 msgstr "マークファイルを開けません\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "メッセージ %d を取り込めません\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\n"
@@ -652,7 +652,7 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -660,27 +660,27 @@ msgstr ""
 "メッセージ作成ウィンドウが開いています。\n"
 "アカウントを編集する前にすべてのメッセージ作成ウィンドウを閉じてください。"
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "アカウント編集ウィンドウを開いています...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "フォルダツリーを作成しています。しばらくお待ちください..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "フォルダツリー作成に失敗しました。"
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "アカウント編集ウィンドウを作成中...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "アカウントの編集"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -688,40 +688,40 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "名前"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "サーバ"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "編集"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " 通常使用するアカウントに指定(_S) "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "本当にアカウント '%s' を削除してもいいですか?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(名称未設定)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "アカウントの削除"
 
@@ -824,7 +824,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "アドレス"
@@ -842,8 +842,8 @@ msgstr "アドレス帳フォルダを選択"
 msgid "Auto-registered address"
 msgstr "自動登録アドレス"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
@@ -863,11 +863,11 @@ msgstr "/ファイル(_F)/新規_JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
@@ -883,21 +883,21 @@ msgstr "/ファイル(_F)/削除(_D)"
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
@@ -941,8 +941,8 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
@@ -954,13 +954,13 @@ msgstr "/ツール(_T)/_LDIFファイルをインポート"
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
@@ -977,7 +977,7 @@ msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1031,17 +1031,17 @@ msgstr "電子メール アドレス"
 msgid "Search:"
 msgstr "検索:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1248,7 +1248,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "注意"
 
@@ -1304,396 +1304,396 @@ msgstr "茶"
 msgid "None"
 msgstr "なし"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/開く(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/追加(_A)..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/ファイル(_F)/送信(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/ファイル(_F)/後で送信(_L)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/ファイル(_F)/ファイルを添付(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/ファイル(_F)/ファイルを挿入(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/ファイル(_F)/署名を挿入(_G)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/ファイル(_F)/署名を追加(_P)"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/編集(_E)/元に戻す(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編集(_E)/現在の段落を整形する(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/表示(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/表示(_V)/宛先(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/表示(_V)/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/表示(_V)/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/表示(_V)/返信先を指定(_Reply-To)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/表示(_V)/フォロー先を指定(_Followup-To)"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/表示(_V)/ルーラ(_U)"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/表示(_V)/ツールバーをカスタマイズ(_S)..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/ツール(_T)/開封確認を要求する(_D)"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/ツール(_T)/スペルチェック(_C)"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "添付ファイルがありません"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "宛先の確認"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1701,37 +1701,40 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "メッセージを送信控に保存できません。"
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
+"メッセージの送信は完了しましたが、メッセージを送信控に保存できませんでした。"
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "メッセージに署名できません。"
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "メッセージを暗号化できません。"
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "メッセージを暗号化または署名できません。"
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1742,11 +1745,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1759,15 +1762,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1781,99 +1784,94 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "生成されたメッセージID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "データ形式"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "ファイルが存在しません。"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "実行可能ファイルを開こうとしています"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1885,12 +1883,12 @@ msgstr ""
 "起動したい場合は、ファイルを適当な場所に保存した後、それがウィルスやその他の"
 "悪意のあるプログラムでないことを確認してください。"
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1899,48 +1897,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2439,12 +2437,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -3292,15 +3290,15 @@ msgstr "/ファイル(_F)/メールデータをエクスポート(_E)..."
 msgid "/_File/Empty all _trash"
 msgstr "/ファイル(_F)/すべてのごみ箱を空にする(_T)"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/ファイル(_F)/名前を付けて保存(_S)..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/ファイル(_F)/ページ設定(_U)..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/ファイル(_F)/印刷(_P)..."
 
@@ -3317,7 +3315,7 @@ msgstr "/ファイル(_F)/終了(_X)"
 msgid "/_Edit/Select _thread"
 msgstr "/編集(_E)/スレッドを選択(_T)"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/編集(_E)/現在のメッセージ内を検索(_F)..."
 
@@ -3534,35 +3532,35 @@ msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
@@ -3570,11 +3568,11 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/表示(_V)/すべてのヘッダ(_H)"
 
@@ -3582,7 +3580,7 @@ msgstr "/表示(_V)/すべてのヘッダ(_H)"
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
@@ -3616,16 +3614,16 @@ msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
@@ -3633,27 +3631,27 @@ msgstr "/メッセージ(_M)/返信(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
@@ -3709,7 +3707,7 @@ msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
@@ -3725,23 +3723,23 @@ msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
@@ -3990,39 +3988,39 @@ msgstr "文字(_T)"
 msgid "_None"
 msgstr "非表示(_N)"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "選択したメッセージを結合できませんでした。"
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "開くフォルダを選択してください"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "コマンドラインオプション"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "使用法: sylpheed [オプション]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4052,7 +4050,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4082,15 +4080,15 @@ msgstr ""
 "このヘルプを表示して終了する\n"
 "バージョン情報を出力して終了する"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Windows 専用オプション:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "IPC リモートコマンド用のポートを指定する"
 
@@ -4127,27 +4125,27 @@ msgstr "メッセージの終わりまで検索しました。始めから検索
 msgid "Search finished"
 msgstr "検索完了"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "メッセージビューを作成中...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "テキスト"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "添付"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
@@ -4204,7 +4202,7 @@ msgstr "検証するには「署名を検証」を選択してください"
 msgid "Select an action for the attached file:\n"
 msgstr "添付ファイルに対する操作を選択してください:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "アプリケーションから開く(_W)..."
 
@@ -4212,7 +4210,7 @@ msgstr "アプリケーションから開く(_W)..."
 msgid "_Display as text"
 msgstr "テキストとして表示(_D)"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "名前を付けて保存(_S)..."
 
@@ -4229,7 +4227,8 @@ msgid "_Check signature"
 msgstr "署名を検証(_C)"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "マルチパートメッセージのパートを保存できません。"
 
@@ -4237,11 +4236,11 @@ msgstr "マルチパートメッセージのパートを保存できません。
 msgid "Can't save the attachments."
 msgstr "添付ファイルを保存できません。"
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "アプリケーションから開く"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5970,20 +5969,20 @@ msgstr "表示する項目"
 msgid " Revert to default "
 msgstr " 初期設定に戻す "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "振り分けの設定"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "有効"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "本当にルール '%s' を削除してもいいですか?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "ルールの削除"
 
@@ -7119,7 +7118,7 @@ msgstr "署名がありません"
 msgid "Good signature from \"%s\""
 msgstr "差出人 \"%s\" の正当な署名"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "正当な署名"
 
@@ -7128,7 +7127,7 @@ msgstr "正当な署名"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "有効な署名ですが \"%s\" の鍵は信用されていません"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "有効な署名 (信用されていない鍵)"
 
@@ -7164,7 +7163,7 @@ msgstr "署名は有効ですが署名鍵が失効しています"
 msgid "BAD signature from \"%s\""
 msgstr "差出人 \"%s\" の不正な署名"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "不正な署名"
 
@@ -7641,19 +7640,27 @@ msgstr "%d 通のメッセージが振り分けられました。"
 msgid "file %s already exists\n"
 msgstr "ファイル %s はすでに存在します\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "テキストビューを作成中...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "このメッセージは暗号化されていますが、復号できませんでした。\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+msgid "_Open"
+msgstr "開く(_O)"
+
+#: src/textview.c:820
+msgid "_Copy file name"
+msgstr "ファイル名をコピー(_C)"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "このメッセージは表示できません。\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7661,35 +7668,35 @@ msgstr ""
 "一時ファイルへの書き込みが失敗したため、このメッセージ本文は表示できませんで"
 "した。\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "画像を保存(_V)..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "新規メッセージを作成(_N)"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "このアドレスに返信(_E)"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "アドレス帳に追加(_B)..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "アドレスをコピー(_R)"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Webブラウザで開く(_O)"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "リンクをコピー(_L)"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7702,7 +7709,7 @@ msgstr ""
 "\n"
 "とにかく開きますか?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
 
@@ -7782,3 +7789,9 @@ msgstr "このツールはローカルフォルダでのみ利用可能です。
 #: plugin/attachment_tool/attachment_tool.c:272
 msgid "Do you really remove attached files from the selected messages?"
 msgstr "選択したメッセージから添付ファイルを削除してもよろしいですか?"
+
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "メッセージを送信控に保存できません。"
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "生成されたメッセージID: %s\n"
diff --git a/po/ko.po b/po/ko.po
index 42164c21..5580f016 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
 
@@ -231,7 +231,7 @@ msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -526,12 +526,12 @@ msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 msgid "can't open mark file\n"
 msgstr "표시 파일을 열수가 없습니다\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "메시지 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
@@ -647,7 +647,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -655,29 +655,29 @@ msgstr ""
 "다른 편집 창이 열려있습니다.\n"
 "계정을 편집하기전에 모든 편집창들을 닫아주세요."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "계정 편집창을 엽니다...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "계정 편집창을 생성합니다...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "계정 편집"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -685,42 +685,42 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "이름"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "서버"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "편집"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " 기본 계정으로 설정 "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "제목 없슴"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "계정 삭제"
 
@@ -821,7 +821,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "주소"
@@ -840,8 +840,8 @@ msgstr "주소록 폴더 선택"
 msgid "Auto-registered address"
 msgstr "등록된 규칙"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/파일(_F)"
 
@@ -862,11 +862,11 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
@@ -882,21 +882,21 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
@@ -943,8 +943,8 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
@@ -957,13 +957,13 @@ msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
@@ -980,7 +980,7 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1037,17 +1037,17 @@ msgstr "이메일 주소"
 msgid "Search:"
 msgstr "찾기"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "숨은 참조:"
@@ -1255,7 +1255,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "알림"
 
@@ -1311,442 +1311,442 @@ msgstr "갈색"
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/열기(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "첨부"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "제목:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1754,40 +1754,42 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1797,12 +1799,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1811,15 +1813,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1828,104 +1830,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "생성된 Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "날짜"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1933,12 +1930,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1948,52 +1945,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2512,12 +2509,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -3384,16 +3381,16 @@ msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
@@ -3411,7 +3408,7 @@ msgstr "/파일(_F)/끝내기(_x)"
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
@@ -3637,42 +3634,42 @@ msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
@@ -3681,11 +3678,11 @@ msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/보기(_V)/모든 헤더(_h)"
@@ -3694,7 +3691,7 @@ msgstr "/보기(_V)/모든 헤더(_h)"
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
@@ -3734,16 +3731,16 @@ msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
@@ -3751,27 +3748,27 @@ msgstr "/메시지(_M)/회신(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
@@ -3832,7 +3829,7 @@ msgstr "/메시지(_M)/새 메일 받기(_i)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
@@ -3851,23 +3848,23 @@ msgstr "/도구(_T)/메시지 필터(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
@@ -4133,42 +4130,42 @@ msgstr "텍스트"
 msgid "_None"
 msgstr "없음"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "폴더 선택"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4185,7 +4182,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4202,15 +4199,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4247,27 +4244,27 @@ msgstr "메시지의 끝에 도달했습니다; 시작부분에서 계속할까�
 msgid "Search finished"
 msgstr "찾기가 완료"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "메시지 뷰를 생성합니다...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "텍스트"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "첨부"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
@@ -4329,7 +4326,7 @@ msgstr "확인하기 위해 \"서명 확인\" 선택"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/...로 열기(_w)"
@@ -4339,7 +4336,7 @@ msgstr "/...로 열기(_w)"
 msgid "_Display as text"
 msgstr "/텍스트로 보기(_D)"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/새 이름으로(_S)..."
@@ -4356,7 +4353,8 @@ msgid "_Check signature"
 msgstr "/서명 확인(_C)"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "multipart 메시지의 부분을 저장할 수가 없습니다."
 
@@ -4365,11 +4363,11 @@ msgstr "multipart 메시지의 부분을 저장할 수가 없습니다."
 msgid "Can't save the attachments."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "...로 열기"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6146,21 +6144,21 @@ msgstr "표시될 항목"
 msgid " Revert to default "
 msgstr " 기본값으로 원상복구 "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "거르개 설정"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "정말로 이 규칙을 삭제하시겠습니까?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "규칙 삭제"
 
@@ -7358,7 +7356,7 @@ msgstr "서명이 발견되지않음"
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Good signature"
 
@@ -7367,7 +7365,7 @@ msgstr "Good signature"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7403,7 +7401,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "BAD signature"
 
@@ -7897,60 +7895,70 @@ msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 msgid "file %s already exists\n"
 msgstr "%s 파일이 이미 존재합니다\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "텍스트 뷰를 생성합니다...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/열기(_O)"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "파일 이름"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "이 메시지를 받지않을 것입니다\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "공용 주소록"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "공용 주소록"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "웹 탐색기"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7959,7 +7967,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8047,6 +8055,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "생성된 Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "마임 타입"
 
diff --git a/po/lt.po b/po/lt.po
index ed6b180e..80f9e7fc 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
 
@@ -222,7 +222,7 @@ msgstr "klaida vykdant imap komandą: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -520,12 +520,12 @@ msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 msgid "can't open mark file\n"
 msgstr "negali atidaryti žymų failo\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti laiško %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: „%s“\n"
@@ -652,7 +652,7 @@ msgstr ""
 "adresu „Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA“."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -660,29 +660,29 @@ msgstr ""
 "Yra atidarytų laiško kūrimo langų.\n"
 "Užverkite juos prieš redaguodami sąskaitas."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Atveriamas sąskaitos redagavimo langas...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Sukuriamas sąskaitos redagavimo langas...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Redaguoti sąskaitas"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -690,40 +690,40 @@ msgstr ""
 "Nauji laiškai bus tikrinami šia tvarka. Pažymėkite laukelį\n"
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Serveris"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Taisyti"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " Pažymėti kaip pagrindinę _sąskaitą "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ar tikrai norite pašalinti sąskaitą „%s“?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Pašalinti sąskaitą"
 
@@ -826,7 +826,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresai"
@@ -845,8 +845,8 @@ msgstr "Pažymėkite adresų knygos katalogą"
 msgid "Auto-registered address"
 msgstr "Registruoti šablonai"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Failas"
 
@@ -866,11 +866,11 @@ msgstr "/_Failas/Naujas _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
@@ -886,21 +886,21 @@ msgstr "/_Failas/Išt_rinti"
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
@@ -947,8 +947,8 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
@@ -960,13 +960,13 @@ msgstr "/Į_rankiai/Importuoti _LDIF failą"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
@@ -983,7 +983,7 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1037,17 +1037,17 @@ msgstr "El. pašto adresas"
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slapta kopija:"
@@ -1249,7 +1249,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1305,399 +1305,399 @@ msgstr "Ruda"
 msgid "None"
 msgstr "Nieko"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Atverti"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Pri_dėti..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Failas/_Siųsti"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Failas/Siųsti _vėliau"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Failas/Išsaugoti _juodraštį"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Failas/Išsaugoti ir _toliau redaguoti"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Failas/Prise_gti failą"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Failas/Įt_erpti failą"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Failas/Įterpti pa_rašą"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Failas/_Pridėti parašą"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Taisa/_Atšaukti"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Taisa/Pa_kartoti"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Taisa/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisa/Iškirp_ti"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisa/Įdėti kaip _citatą"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Taisa/Žymėti _viską"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Taisa/_Laužyti pastraipą"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Taisa/Laužyti _visas ilgas eilutes"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisa/_Automatiškai laužyti"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/Ro_dymas"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/Ro_dymas/_Kam"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/Ro_dymas/Ko_pija"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/Ro_dymas/_Slapta kopija"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/Ro_dymas/Kam _atsakyti"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/Ro_dymas/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/Ro_dymas/_Gija"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/Ro_dymas/_Liniuotė"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/Ro_dymas/Prise_gti failai"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr ""
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/Ro_dymas/Simbolių ko_duotė"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/Ro_dymas/Simbolių ko_duotė/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Į_rankiai/Naudoti išorinį redaktorių"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Į_rankiai/PGP _parašas"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Į_rankiai/PGP ši_fravimas"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/Į_rankiai/_Tikrinti rašybą"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priedai"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1705,40 +1705,42 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Negaliu išsaugoti laiško „outbox“."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1749,11 +1751,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1766,15 +1768,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1783,101 +1785,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "sugeneruotas Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Atveriamas vykdomasis failas"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1888,12 +1885,12 @@ msgstr ""
 "Jei norite jį paleisti, išsaugokite jį ir įsitikinkite ar tai ne virusas ar "
 "panaši kenkėjiška programa."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1902,48 +1899,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2453,12 +2450,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -3318,15 +3315,15 @@ msgstr "/_Failas/_Eksportuoti į „mbox“ failą..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Failas/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Failas/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Failas/P_uslapio nuostatos..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Failas/_Spausdinti..."
 
@@ -3343,7 +3340,7 @@ msgstr "/_Failas/Iš_eiti"
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisa/Pažymė_ti giją"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisa/_Rasti laiške"
 
@@ -3564,35 +3561,35 @@ msgstr "/Ro_dymas/_Eiti į/Kitas laiškas su etikete"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
@@ -3600,11 +3597,11 @@ msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Ro_dymas/Atverti naujame _lange"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/Ro_dymas/Laiško pr_adinis tekstas"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/Ro_dymas/_Visos antraštės"
 
@@ -3612,7 +3609,7 @@ msgstr "/Ro_dymas/_Visos antraštės"
 msgid "/_View/_Update summary"
 msgstr "/Ro_dymas/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Laiškas"
 
@@ -3647,16 +3644,16 @@ msgstr "/_Laiškas/_Siųsti laiškus eilėje"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Laiškas/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Laiškas/Rašyti _naują"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Laiškas/_Atsakyti"
 
@@ -3664,27 +3661,27 @@ msgstr "/_Laiškas/_Atsakyti"
 msgid "/_Message/Repl_y to"
 msgstr "/_Laiškas/Atsak_yti kam"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Laiškas/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Laiškas/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Laiškas/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Laiškas/_Persiųsti"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Laiškas/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Laiškas/Nukreip_ti"
 
@@ -3742,7 +3739,7 @@ msgstr "/_Laiškas/Pažymėti kaip nepageidautiną"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Laiškas/Pažymėti kaip pageidautiną"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
@@ -3758,23 +3755,23 @@ msgstr "/Į_rankiai/_Filtruoti laiškus kataloge"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktus laiškus"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
@@ -4026,40 +4023,40 @@ msgstr "_Tekstas"
 msgid "_None"
 msgstr "_Nieko"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Pasirinkti katalogą"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4089,7 +4086,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4119,15 +4116,15 @@ msgstr ""
 "rodyti pagalbos tekstą\n"
 "rodyti versiją"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4164,27 +4161,27 @@ msgstr "Pasiekta laiško pabaiga; tęsti nuo pradžios?"
 msgid "Search finished"
 msgstr "Paieška baigta"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Sukuriama laiško peržiūra...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Priedai"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
@@ -4241,7 +4238,7 @@ msgstr "Pasirinkite „Tikrinti parašą“ patikrinimui"
 msgid "Select an action for the attached file:\n"
 msgstr "Pasirinkite veiksmą prisegtam failui:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Atver_ti su..."
 
@@ -4249,7 +4246,7 @@ msgstr "Atver_ti su..."
 msgid "_Display as text"
 msgstr "_Rodyti kaip tekstą"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Iš_saugoti kaip..."
 
@@ -4266,7 +4263,8 @@ msgid "_Check signature"
 msgstr "Tikrinti _parašą"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Negaliu išsaugoti dalies sudėtinio laiško."
 
@@ -4274,11 +4272,11 @@ msgstr "Negaliu išsaugoti dalies sudėtinio laiško."
 msgid "Can't save the attachments."
 msgstr "Negaliu išsaugoti priedų."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Atverti su"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6025,20 +6023,20 @@ msgstr "Rodomi laukai"
 msgid " Revert to default "
 msgstr " Atkurti į įprastą "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Filtro nustatymai"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Aktyvus"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ar tikrai norite ištrinti taisyklę „%s“?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Ištrinti taisyklę"
 
@@ -7198,7 +7196,7 @@ msgstr "Parašas nerastas"
 msgid "Good signature from \"%s\""
 msgstr "Geras parašas nuo „%s“"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Geras parašas"
 
@@ -7207,7 +7205,7 @@ msgstr "Geras parašas"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geras parašas, bet „%s“ raktas nėra patikimas"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Geras parašas (nepatikimas raktas)"
 
@@ -7243,7 +7241,7 @@ msgstr "Parašas geras, bet raktas buvo pakeistas"
 msgid "BAD signature from \"%s\""
 msgstr "BLOGAS „%s“ parašas"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "BLOGAS parašas"
 
@@ -7728,54 +7726,64 @@ msgstr "Filtruota laiškų: %d"
 msgid "file %s already exists\n"
 msgstr "failas %s jau egzistuoja\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Sukuriama teksto peržiūra...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Laiškas yra užkoduotas, tačiau nepavyko jo iškoduoti.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Atverti"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Failo vardas"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Laiškas negali būti parodytas.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Pridėti į adresų _knygą"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Atverti su naršykle"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorodą"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7788,7 +7796,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
@@ -7870,6 +7878,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Negaliu išsaugoti laiško „outbox“."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "sugeneruotas Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME tipas"
 
diff --git a/po/nl.po b/po/nl.po
index 070783b0..25a7cb3f 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Configuratie inlezen van alle accounts...\n"
 
@@ -226,7 +226,7 @@ msgstr "Fout bij IMAP-opdracht: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -527,12 +527,12 @@ msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Adrukopdracht is ongeldig: '%s'\n"
@@ -661,7 +661,7 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -669,29 +669,29 @@ msgstr ""
 "Er zijn nog schermen open om een nieuw bericht op te stellen.\n"
 "Deze moeten gesloten worden om de postvakken te kunnen bewerken."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Accountvoorkeuren worden geopend...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Postvakeigenschappen venster word gemaakt...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -700,40 +700,40 @@ msgstr ""
 "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
 "u op de knop 'Alles ophalen' klikt."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Naam"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "Instellen als _hoofdaccount"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wilt u het account '%s' werkelijk verwijderen?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Geen titel)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Account verwijderen"
 
@@ -836,7 +836,7 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
@@ -855,8 +855,8 @@ msgstr "Selecteer adresboekmap"
 msgid "Auto-registered address"
 msgstr "Gebruikte sjablonen"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Bestand"
 
@@ -876,11 +876,11 @@ msgstr "/_Bestand/Nieuwe _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
@@ -896,21 +896,21 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
@@ -957,8 +957,8 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
@@ -971,13 +971,13 @@ msgstr "/_Gereedschap/_LDIF bestand importeren"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
@@ -994,7 +994,7 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1050,17 +1050,17 @@ msgstr "E-mail adres"
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1272,7 +1272,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1328,403 +1328,403 @@ msgstr "Bruin"
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Openen"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Bericht/_Verzenden"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Bericht/_Later verzenden"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Bericht/Klad _opslaan"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Bericht/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bestand _invoegen"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening invoegen"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Bericht/Handtekening _toevoegen"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/Be_werken/_Ongedaan maken"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/Be_werken/O_pnieuw toepassen"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/Be_werken/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/Be_werken/K_nippen"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Be_werken/Plakken als _citaat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/Be_werken/_Alles selecteren"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Be_werken/Regelterugloop in hele bericht"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Be_werken/Regel_terugloop"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/Beel_d"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/Beel_d/_Aan"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/Beel_d/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/Beel_d/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/Beel_d/Ant_woord naar"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/Beel_d/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/Beel_d/_Lineaal"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/Beel_d/_Bijlage"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/Beel_d/_Tekstcodering"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Beel_d/_Tekstcodering/_Automatisch"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/Beel_d/_Tekstcodering/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Beel_d/_Tekstcodering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Beel_d/_Tekstcodering/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Beel_d/_Tekstcodering/Centraaleuropees (ISO-8859-2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Beel_d/_Tekstcodering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Beel_d/_Tekstcodering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Beel_d/_Tekstcodering/Thais (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Beel_d/_Tekstcodering/Thais (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Gereedschap/Be_werken met externe editor"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/_Ondertekenen met PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/_Coderen met PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Gereedschap/_Spellingscontrole"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal instellen"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bijlagen"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1732,40 +1732,42 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-msgid "Can't save the message to outbox."
-msgstr "Het bericht kan niet opgeslagen worden in de outbox."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1776,11 +1778,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1793,15 +1795,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1810,101 +1812,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "gegenereerd bericht-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Openen van uitvoerbaar bestand"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1916,12 +1913,12 @@ msgstr ""
 "Als u het wilt uitvoeren, dient u het bestand ergens op te slaan en te "
 "controleren om virussen geen kans te geven."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1930,48 +1927,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2487,12 +2484,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -3368,16 +3365,16 @@ msgstr "/_Bestand/Mbox bestand _exporteren..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _legen"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
@@ -3394,7 +3391,7 @@ msgstr "/_Bestand/A_fsluiten"
 msgid "/_Edit/Select _thread"
 msgstr "/Be_werken/_Discussie selecteren"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/Zoeken in bericht..."
 
@@ -3616,35 +3613,35 @@ msgstr "/Beel_d/_Ga naar/Volgende gelab_eld bericht"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Beel_d/_Tekstcodering/Automatisch"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Beel_d/_Tekstcodering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (ISO-2022-KR)"
 
@@ -3652,11 +3649,11 @@ msgstr "/Beel_d/_Tekstcodering/Koreaans (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Beel_d/In _nieuw venster openen"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/Beel_d/_Broncode weergeven"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Beel_d/Vo_lledige header"
@@ -3665,7 +3662,7 @@ msgstr "/Beel_d/Vo_lledige header"
 msgid "/_View/_Update summary"
 msgstr "/Beel_d/_Verversen"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/Be_richt"
 
@@ -3701,16 +3698,16 @@ msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
@@ -3718,27 +3715,27 @@ msgstr "/Be_richt/_Beantwoorden"
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_discussielijst"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen _als bijlage"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
@@ -3796,7 +3793,7 @@ msgstr "/Be_richt/Als _troep markeren"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/Als _geen troep markeren"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
@@ -3812,23 +3809,23 @@ msgstr "/_Gereedschap/Alle berichten _filteren"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/_Geselecteerde berichten filteren"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
@@ -4086,44 +4083,44 @@ msgstr "Tekst"
 msgid "_None"
 msgstr "Geen"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "U bent off-line aan het werken. Klik op het pictogram om on-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "U bent on-line aan het werken. Klik op het pictogram om off-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selecteer map"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4153,7 +4150,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4183,15 +4180,15 @@ msgstr ""
 "dit bericht weergeven\n"
 "versieinformatie weergeven"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4228,27 +4225,27 @@ msgstr "Einde van het bericht bereikt; verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Bijlagen"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
@@ -4309,7 +4306,7 @@ msgstr "Selecteer \"Verifieer handtekening\" om te controleren"
 msgid "Select an action for the attached file:\n"
 msgstr "Kies een actie voor het bijgevoegde bestand:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Openen _met..."
 
@@ -4317,7 +4314,7 @@ msgstr "Openen _met..."
 msgid "_Display as text"
 msgstr "_Als tekst weergeven"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Opslaan _als..."
 
@@ -4334,7 +4331,8 @@ msgid "_Check signature"
 msgstr "_Handtekening verifiëren"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Kan het deel van een meerdelig bericht niet opslaan."
 
@@ -4342,11 +4340,11 @@ msgstr "Kan het deel van een meerdelig bericht niet opslaan."
 msgid "Can't save the attachments."
 msgstr "Kan bijlagen niet opslaan."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Open met"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6114,21 +6112,21 @@ msgstr "Weergegeven items"
 msgid " Revert to default "
 msgstr " Standaard herstellen"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Filterbeheer"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wilt u de regel '%s' verwijderen?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
@@ -7304,7 +7302,7 @@ msgstr "Geen hadtekening gevonden"
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde handtekening van \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Correcte handtekening"
 
@@ -7313,7 +7311,7 @@ msgstr "Correcte handtekening"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geldige ondertekening maar de sleutel voor \"%s\" wordt niet vertrouwd"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Geldige ondertekening (onbetrouwbare sleutel)"
 
@@ -7349,7 +7347,7 @@ msgstr "Geldige ondertekening maar de sleutel is verlopen"
 msgid "BAD signature from \"%s\""
 msgstr "SLECHTE handtekening van \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "FOUTIEVE handtekening"
 
@@ -7837,54 +7835,64 @@ msgstr "Er zijn %d berichten gefilterd."
 msgid "file %s already exists\n"
 msgstr "bestand %s bestaat al\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Tekstvenster wordt aangemaakt...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/Openen"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Bestandsnaam"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Dit bericht kan niet worden weergegeven.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Afbeelding opslaan _als..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "_Nieuw bericht opstellen"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "_Adres kopiëren"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "_Adres kopiëren"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Openen met webbrowser"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "_Link kopiëren"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7897,7 +7905,7 @@ msgstr ""
 "\n"
 "Wilt u het toch openen?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Waarschuwing! Misleidende link"
 
@@ -7980,6 +7988,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Het bericht kan niet opgeslagen worden in de outbox."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "gegenereerd bericht-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME type"
 
diff --git a/po/pl.po b/po/pl.po
index de8d8334..f4aa27da 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-07 12:00+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: Jan Stępień <jstepien@users.sourceforge.net>\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawień wszystkich kont...\n"
 
@@ -219,7 +219,7 @@ msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
@@ -511,12 +511,12 @@ msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 msgid "can't open mark file\n"
 msgstr "nie można otworzyć pliku zaznaczeń\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie można pobrać wiadomości %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
@@ -645,7 +645,7 @@ msgstr ""
 "Licencji Publicznej GNU (GNU General Public License);jeśli nie - napisz do "
 "Free Software Foundation, Inc., 675 Mass Ave,Cambridge, MA 02139, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -653,27 +653,27 @@ msgstr ""
 "Niektóre okna edycji są otwarte.\n"
 "Zamknij wszystkie okna edycji przed zmianami konta."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Otwieranie okna edycji konta...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Tworzenie drzewa katalogów. Proszę czekać..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Błąd podczas tworzenia drzewa katalogów."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Tworzenie okna edycji konta...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Edycja kont"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -681,40 +681,40 @@ msgstr ""
 "Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokół"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Serwer"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "U_staw jako domyślne konto "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto '%s'?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Nienazwany)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Usuń konto"
 
@@ -817,7 +817,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
@@ -835,8 +835,8 @@ msgstr "Wybierz katalog książki adresowej"
 msgid "Auto-registered address"
 msgstr "Adresy zebrane automatycznie"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Plik"
 
@@ -856,11 +856,11 @@ msgstr "/_Plik/Nowy _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
@@ -876,21 +876,21 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
@@ -937,8 +937,8 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
@@ -950,13 +950,13 @@ msgstr "/_Plik/Importuj plik _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
@@ -973,7 +973,7 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1027,17 +1027,17 @@ msgstr "Adres e-mail"
 msgid "Search:"
 msgstr "Szukaj: "
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
@@ -1244,7 +1244,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1300,397 +1300,397 @@ msgstr "Brązowy"
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otwórz"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Plik/Wyślij"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Plik/Wyś_lij później"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Plik/Zapisz w katalogu _szablonów"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Plik/Zapisz i kontynuuj _edycję"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Plik/Dołącz p_odpis"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Widok/Dostosuj katalog..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Widok/Kodowani_e znaków/Arabskie (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Widok/Kodowani_e znaków/Arabskie (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Narzędzia/_Sprawdź pisownię"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Zmień język sprawdzania pisowni"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Tworzenie wiadomości%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Pusty temat"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Brak załącznika"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nie ma załączników. Wysłać bez załącznika?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Sprawdź odbiorców"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Na pewno wysłać tę wiadomość do następujących odbiorców?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1698,38 +1698,40 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Nie można zapisać wiadomości do outbox."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Nie można podpisać wiadomości."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Nie można zaszyfrować wiadomości."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Nie można zaszyfrować lub podpisać wiadomości."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1739,11 +1741,11 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to w %s ?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr ""
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1752,15 +1754,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Limit długości linii"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Szyfrowanie z odbiorcami ukrytej kopii"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 #, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
@@ -1776,99 +1778,94 @@ msgstr ""
 "\n"
 "Wysłać mimo to?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "wygenerowany Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Typ danych"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Plik nie istnieje."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Otwieranie pliku wykonywalnego"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1880,12 +1877,12 @@ msgstr ""
 "Aby go uruchomić, zapisz go gdzieś i upewnij się, że nie jest to wirus bądź "
 "inny niepożądany program."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1894,48 +1891,48 @@ msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Czy wymusić zakończenie procesu (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Dostosuj pasek narzędzi..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Zapisz wiadomość"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmodyfikowana. Zapisać ją w folderze szkiców?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Zamień"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Wstaw"
 
@@ -2436,12 +2433,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -3295,15 +3292,15 @@ msgstr "/_Plik/_Eksportuj do pliku mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Plik/_Ustawienia strony..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
@@ -3320,7 +3317,7 @@ msgstr "/_Plik/_Koniec"
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
@@ -3537,36 +3534,36 @@ msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
@@ -3574,11 +3571,11 @@ msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Widok/Wszystkie na_główki"
 
@@ -3586,7 +3583,7 @@ msgstr "/_Widok/Wszystkie na_główki"
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
@@ -3621,16 +3618,16 @@ msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
@@ -3638,27 +3635,27 @@ msgstr "/Wiado_mość/_Odpowiedz"
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
@@ -3716,7 +3713,7 @@ msgstr "/Wiado_mość/Oznacz jako _niechcianą"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Wiadomość/Oznacz jako _pożądaną"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
@@ -3733,23 +3730,23 @@ msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
@@ -4010,42 +4007,42 @@ msgstr "Tekst"
 msgid "_None"
 msgstr "Brak"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Wybierz katalog"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4062,7 +4059,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4079,15 +4076,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4124,27 +4121,27 @@ msgstr "Osiągnięto koniec wiadomości; czy kontynuować od początku?"
 msgid "Search finished"
 msgstr "Przeszukiwanie zakończone"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomości...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Widok wiadomości - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
@@ -4206,7 +4203,7 @@ msgstr "Wybierz \"Sprawdź podpis\" by sprawdzić"
 msgid "Select an action for the attached file:\n"
 msgstr "Wybierz akcję dla załączonego pliku:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Otwórz _z..."
 
@@ -4214,7 +4211,7 @@ msgstr "Otwórz _z..."
 msgid "_Display as text"
 msgstr "_Wyświetl jako tekst"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Zapi_sz jako..."
 
@@ -4231,7 +4228,8 @@ msgid "_Check signature"
 msgstr "Spr_awdź podpis"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Nie można zapisać części wiadomości wieloczęściowej."
 
@@ -4240,11 +4238,11 @@ msgstr "Nie można zapisać części wiadomości wieloczęściowej."
 msgid "Can't save the attachments."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Otwórz z"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6046,21 +6044,21 @@ msgstr "Wyświetlone elementy"
 msgid " Revert to default "
 msgstr " Przywróć domyślne "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Reguły filtrowania"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Aktywna"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naprawdę chcesz usunąć regułkę '%s'?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Usuń regułę"
 
@@ -7241,7 +7239,7 @@ msgstr "Nie znaleziono podpisu"
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis od \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Poprawny podpis"
 
@@ -7250,7 +7248,7 @@ msgstr "Poprawny podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Poprawny podpis, ale klucz dla \"%s\" nie jest zaufany"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Poprawny podpis (niezaufany klucz)"
 
@@ -7286,7 +7284,7 @@ msgstr "Podpis poprawny, ale klucz został unieważniony"
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis od \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "ZŁY podpis"
 
@@ -7804,21 +7802,31 @@ msgstr "%d wiadomość(i) przefiltrowano."
 msgid "file %s already exists\n"
 msgstr "plik %s już istnieje\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Tworzenie widoku tekstowego...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 "Wiadomość jest zaszyfrowana, próba odszyfrowania zakończyła się "
 "niepowodzeniem.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Otwórz"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nazwa pliku"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7826,40 +7834,40 @@ msgstr ""
 "Nie można wyświetlić treści ze względu na błąd podczas zapisu do pliku "
 "tymczasowego.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7872,7 +7880,7 @@ msgstr ""
 "\n"
 "Otworzyć mimo to?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Ostrzeżenie przed fałszywym URL"
 
@@ -7961,6 +7969,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Nie można zapisać wiadomości do outbox."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "wygenerowany Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Typ MIME "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 962f6493..77e7e85f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-21 07:33-0200\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configurações de cada conta...\n"
 
@@ -231,7 +231,7 @@ msgstr "Erro no comando IMAP: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "O iconv não pode converter UTF-7 para %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "O iconv não pode converter %s para UTF-7\n"
@@ -529,12 +529,12 @@ msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
 msgid "can't open mark file\n"
 msgstr "Não foi possível abrir o arquivo de marcas\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "não foi possível obter a mensagem %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Comando de impressão inválido: \"%s\"\n"
@@ -662,7 +662,7 @@ msgstr ""
 "programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -670,27 +670,27 @@ msgstr ""
 "Algumas janelas de edição estão abertas.\n"
 "Por favor feche-as antes de editar as contas."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Abrindo janela de edição de conta...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Criando árvore de diretórios. Por favor, aguarde..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "A criação da árvore de diretórios falhou."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Criando janela de edição de conta...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -698,40 +698,40 @@ msgstr ""
 "Mensagens novas serão baixadas nesta ordem. Marque as caixas\n"
 "na coluna \"G\" para habilitar essa caixa no comando \"Receber todas\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " _Definir como conta padrão "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Você realmente deseja excluir a conta \"%s\"?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Excluir conta"
 
@@ -834,7 +834,7 @@ msgstr "Argumento de usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Endereço"
@@ -852,8 +852,8 @@ msgstr "Selecione pasta do Catálogo de Endereços"
 msgid "Auto-registered address"
 msgstr "Endereços registrados automaticamente"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Arquivo"
 
@@ -873,11 +873,11 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
@@ -893,21 +893,21 @@ msgstr "/_Arquivo/E_xcluir"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
@@ -951,8 +951,8 @@ msgstr "/_Endereço/E_ditar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
@@ -964,13 +964,13 @@ msgstr "/_Ferramentas/Importar arquivo _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
@@ -987,7 +987,7 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1041,17 +1041,17 @@ msgstr "Endereço de e-mail"
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Cco:"
@@ -1262,7 +1262,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1318,397 +1318,397 @@ msgstr "Marrom"
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Abrir"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Propr_iedades..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Enviar"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Arquivo/Enviar _depois"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arquivo/Salvar como rascunho"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arquivo/Salvar e _continuar editando"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Arquivo/Incluir as_sinatura"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Re_cortar"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/Selecionar _tudo"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar _linhas longas"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebrar linhas automaticamente"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Cco"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/E_xibir/_Reply-To"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/E_xibir/_Followup-To"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/E_xibir/Per_sonalizar barra de ferramentas..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação de caracteres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_Codificação de caracteres/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Central (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação de caracteres/Árabe (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação de caracteres/Árabe (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Ferramentas/Editar com aplicativo e_xterno"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Ferramentas/Solicitar confirmação _de entrega"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Assinar com PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Ferramentas/_Criptografar com PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/_Verificar ortografia"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Não foi possível receber o texto\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível obter o tamanho de %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) desta mensagem."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Editando%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "O assunto está em branco. Enviar mesmo assim?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Anexo faltante"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Não há anexos. Enviar assim mesmo?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Verificar destinatários"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr ""
 "Você realmente deseja enviar este e-mail para os seguintes destinatários?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "Não foi possível  obter a lista de destinatários."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1716,37 +1716,39 @@ msgstr ""
 "A conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3573
-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:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível localizar a chave para \"%s\"."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Não foi possível assinar a mensagem."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Não foi possível cripografar a mensagem."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Não foi possível assinar ou criptografar a mensagem."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1758,11 +1760,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Erro ao converter a codificação"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1775,15 +1777,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Criptografando com Bcc"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1797,99 +1799,94 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "não foi possível remover a mensagem antiga\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "Message-ID gerado: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Criptografar com PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Tipo de dados"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "O arquivo não existe."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Abrindo arquivo executável"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1901,12 +1898,12 @@ msgstr ""
 "Se você deseja executá-lo, salve-o em algum diretório e certifique-se de que "
 "não seja um vírus ou programa malicioso."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1915,49 +1912,49 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Personalizar a barra de ferramentas..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Esta mensagem foi modificada.  Você deseja salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Você deseja aplicar o modelo \"%s\"?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2458,12 +2455,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -3313,15 +3310,15 @@ msgstr "/_Arquivo/_Exportar dados..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Arquivo/Confi_gurar Página..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
@@ -3338,7 +3335,7 @@ msgstr "/_Arquivo/Sai_r"
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar conversa"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Procurar na mensagem atual..."
 
@@ -3555,35 +3552,35 @@ msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
@@ -3591,11 +3588,11 @@ msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
@@ -3603,7 +3600,7 @@ msgstr "/E_xibir/_Todos os cabeçalhos"
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/At_ualizar sumário"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Mensagem"
 
@@ -3637,16 +3634,16 @@ msgstr "/_Mensagem/Enviar mensagens da caixa de _saída"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Escrever _nova mensagem"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
@@ -3654,27 +3651,27 @@ msgstr "/_Mensagem/_Responder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/Responder _para"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder _para/_todos"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder _para/_remetente"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder _para/_lista"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Re_direcionar"
 
@@ -3730,7 +3727,7 @@ msgstr "/_Mensagem/Classificar como _spam"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/C_lassificar como não-spam"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/_Editar novamente"
 
@@ -3746,23 +3743,23 @@ msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/Criar regra de filtro"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/Criar regra de _filtro/_Automaticamente"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/Criar regra de _filtro/Pelo _remetente"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/Criar regra de _filtro/Pelo _destinatário"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _filtro/Pelo a_ssunto"
 
@@ -4013,39 +4010,39 @@ msgstr "_Texto"
 msgid "_None"
 msgstr "_Nenhuma"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Você deseja sair deste programa?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "As mensagens selecionadas não podem ser combinadas"
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Selecione uma pasta para abrir"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4075,7 +4072,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4105,15 +4102,15 @@ msgstr ""
 "exibe esta ajuda e encerra\n"
 "exibe informação de versão e encerra"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Opção para Windows apenas:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "Indique a porta para comandos IPC remotos"
 
@@ -4150,27 +4147,27 @@ msgstr "O final da mensagem foi atingido; recomeçar do início?"
 msgid "Search finished"
 msgstr "Busca concluída"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar remetente ao Catálogo de _Endereços"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Anexos"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo \"%s\"."
@@ -4227,7 +4224,7 @@ msgstr "Selecione \"Verificar assinatura\" para verificar"
 msgid "Select an action for the attached file:\n"
 msgstr "Selecione uma ação para o arquivo anexo:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Ab_rir com..."
 
@@ -4235,7 +4232,7 @@ msgstr "Ab_rir com..."
 msgid "_Display as text"
 msgstr "E_xibir como texto"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Salvar como..."
 
@@ -4252,7 +4249,8 @@ msgid "_Check signature"
 msgstr "/_Verificar assinatura"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Não foi possível gravar alguma(s) parte(s) dessa mensagem"
 
@@ -4260,11 +4258,11 @@ msgstr "Não foi possível gravar alguma(s) parte(s) dessa mensagem"
 msgid "Can't save the attachments."
 msgstr "Não foi possível salvar os anexos."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Abrir com"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6003,20 +6001,20 @@ msgstr "Itens exibidos"
 msgid " Revert to default "
 msgstr " Voltar ao padrão "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Configuração de filtros"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Você realmente deseja excluir a regra \"%s\"?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Excluir regra"
 
@@ -7153,7 +7151,7 @@ msgstr "Assinatura não encontrada"
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Assinatura correta"
 
@@ -7162,7 +7160,7 @@ msgstr "Assinatura correta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Assinatura válida mas a chave para \"%s\" não é confiável"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Assinatura válida (chave não-confiável)"
 
@@ -7198,7 +7196,7 @@ msgstr "Assinatura válida mas a chave foi revogada"
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Assinatura INVÁLIDA"
 
@@ -7674,19 +7672,29 @@ msgstr "%d mensagem(ns) foram filtradas."
 msgid "file %s already exists\n"
 msgstr "arquivo %s já existe\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Criando visualização do texto...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Esta mensagem está criptografada, mas a decriptografia falhou.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Abrir"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nome do arquivo"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Esta mensagem não pode ser exibida.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7694,35 +7702,35 @@ msgstr ""
 "O corpo do texto não pode ser exibido devido a um erro ao gravar para o "
 "arquivo temporário.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "R_esponder para este endereço"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Copiar este _endereço"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7735,7 +7743,7 @@ msgstr ""
 "\n"
 "Abri-la mesmo assim?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
@@ -7817,6 +7825,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Não foi possível armazenar a mensagem na caixa de saída."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "Message-ID gerado: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Tipo MIME"
 
diff --git a/po/ro.po b/po/ro.po
index 5cfc43b1..73520982 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2010-09-07 15:36+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Citire configurări pentru fiecare cont...\n"
 
@@ -231,7 +231,7 @@ msgstr "eroare în timpul comenzii IMAP: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
@@ -529,12 +529,12 @@ msgstr "procmime_get_text_content(): conversia codului a eșuat.\n"
 msgid "can't open mark file\n"
 msgstr "nu se poate deschide fișierul de marcaj\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nu se poate prelua mesajul %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru tipărire nu este validă: „%s”\n"
@@ -662,7 +662,7 @@ msgstr ""
 "acest program; dacă nu, scrieți la Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -670,30 +670,30 @@ msgstr ""
 "Sunt deschise una sau mai multe ferestre de compunere.\n"
 "Închideți toate ferestrele de compunere înainte de a edita conturile."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Deschidere fereastră editare cont...\n"
 
 # hm ? dosar sau dosare ?
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Se creează arborele de dosare. Așteptați..."
 
 # hm ? dosar sau dosare ?
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Crearea arborelui de dosare a eșuat."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Creare fereastră de editare cont...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Editare conturi"
 
 # !!! dependent de traducerea butonului Get all !!!
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -702,41 +702,41 @@ msgstr ""
 "coloana „G”\n"
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Nume"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
 # hm ? unde apare ?
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Editează"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " _Stabilește ca cont implicit"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Chiar vreți să ștergeți contul „%s” ?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(neintitulat)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Șterge cont"
 
@@ -847,7 +847,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # în meniu la compunere
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Agendă"
@@ -865,8 +865,8 @@ msgstr "Selectați dosarul pentru agendă"
 msgid "Auto-registered address"
 msgstr "Adrese înregistrate automat"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Fișier"
 
@@ -886,11 +886,11 @@ msgstr "/_Fișier/_JPilot nou"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
@@ -906,22 +906,22 @@ msgstr "/_Fișier/Ș_terge"
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # comun și în main menu și în rmb agendă
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
@@ -968,8 +968,8 @@ msgstr "/A_dresă/_Editează"
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Unelte"
 
@@ -981,13 +981,13 @@ msgstr "/_Unelte/Importă un fișier _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
@@ -1004,7 +1004,7 @@ msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1060,17 +1060,17 @@ msgstr "Adresă de e-mail"
 msgid "Search:"
 msgstr "Caută:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1279,7 +1279,7 @@ msgstr "Adrese comune"
 msgid "Personal address"
 msgstr "Adrese personale"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1337,401 +1337,401 @@ msgstr "Maro"
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Deschide"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Adăugă..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/Ște_rge"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Proprietăți..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Fișier/_Trimite"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Fișier/Trimite _mai târziu"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fișier/Salvează în dosarul _ciorne"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fișier/_Salvează și continuă editarea"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Fișier/_Atașează un fișier"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Fișier/_Inserează un fișier"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fișier/Inserea_ză semnătura"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Fișier/Adau_gă semnătura"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulează"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Refă"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Taie"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/_Lipește ca citat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Selecte_ază tot"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editare/_Desparte paragraful curent"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Desparte _liniile lungi"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/Desparte liniile aut_omat"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Vizualizare"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Vizualizare/Că_tre"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Vizualizare/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Vizualizare/_Bcc"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Vizualizare/_Răspuns către"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
 # hm ?
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/_Vizualizare/_Urmărește"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Vizualizare/Ri_glă"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Vizualizare/_Atașament"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vizualizare/Personali_zează bara de unelte..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Vizualizare/Codare caract_ere"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Vizualizare/Codare caract_ere/_Automat"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/Codare caract_ere/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vizualizare/Codare caract_ere/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vizualizare/Codare caract_ere/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vizualizare/Codare caract_ere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vizualizare/Codare caract_ere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/Codare caract_ere/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/Codare caract_ere/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinses (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Șablon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acțiu_ni"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Unelte/Editează cu un editor e_xtern"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Unelte/Cere notificare de _disponibilitate"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Unelte/Semnează P_GP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Unelte/Cr_iptează PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Unelte/Verifi_că ortografia"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Eroare de format al mesajului de răspuns sau înaintat."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, 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:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Trimiteți mesajul oricum ?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Lipsă atașament"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nu este atașat niciun fișier. Trimiteți fără atașamente ?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Confirmare destinatari"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Subiect:"
 
 # butonul de la confirmarea cui se trimite
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Trimite"
 
 # hm ?
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1739,38 +1739,39 @@ msgstr ""
 "Contul pentru trimitere de mesaje nu este specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
-# !!! dependent de traducerea lui Outbox !!!
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Nu se poate salva mesajul în „Trimise”."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate „%s”."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Nu se poate semna mesajul."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Nu se poate cripta mesajul."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Nu se poate cripta sau semna mesajul."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1782,11 +1783,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1799,15 +1800,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1821,100 +1822,95 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi dosarul de coadă\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "Message-ID creat: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dată"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Fișierul nu există."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Deschidere fișier executabil"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1926,12 +1922,12 @@ msgstr ""
 "Dacă vreți să îl lansați în execuție, salvați-l undeva și asigurați-vă că nu "
 "este un virus sau un alt tip de program malițios."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru editor extern nu este validă: „%s”\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1940,49 +1936,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în dosarul Ciorne ?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul „%s” ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2487,12 +2483,12 @@ msgstr "Configurare informații dosar...\n"
 msgid "Setting folder info..."
 msgstr "Configurare informații dosar..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare dosar %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare dosar %s ..."
@@ -3364,15 +3360,15 @@ msgstr "/_Fișier/_Exportă date de corespondență..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Fișier/_Golește tot gunoiul"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Fișier/_Salvează ca..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Fișier/_Aranjare în pagină..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Fișier/Ti_părește..."
 
@@ -3389,7 +3385,7 @@ msgstr "/_Fișier/Ieși_re"
 msgid "/_Edit/Select _thread"
 msgstr "/_Editare/Selectează firul de _discuție"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editare/Caută în mesajul c_urent..."
 
@@ -3610,35 +3606,35 @@ msgstr "/_Vizualizare/Du-_te la/mesajul et_ichetat următor"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vizualizare/Du-_te la/alt _director..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vizualizare/Codare caract_ere/Detectare _automată"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vizualizare/Codare caract_ere/Chinese (ISO-2022-CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (ISO-2022-KR)"
 
@@ -3646,11 +3642,11 @@ msgstr "/_Vizualizare/Codare caract_ere/Korean (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Vizualizare/Deschide în fereastră _nouă"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/S_ursă mesaj"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Vizualizare/Toate _anteturile"
 
@@ -3658,7 +3654,7 @@ msgstr "/_Vizualizare/Toate _anteturile"
 msgid "/_View/_Update summary"
 msgstr "/_Vizualizare/Actua_lizează sumarul mesajelor"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Mesaj"
 
@@ -3692,16 +3688,16 @@ msgstr "/_Mesaj/Trimite mesajele de la coa_dă"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compune un mesaj _nou"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
@@ -3709,27 +3705,27 @@ msgstr "/_Mesaj/_Răspunde"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răsp_uns"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _tuturor"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _expeditorului"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Îna_intează"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintează ca _atașament"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Redirecționea_ză"
 
@@ -3785,7 +3781,7 @@ msgstr "/_Mesaj/Marchează ca _spam"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Marchează ca _util"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editează"
 
@@ -3801,23 +3797,23 @@ msgstr "/_Unelte/_Filtrează toate mesajele în dosar"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Unelte/Filtrează mesajele _selectate"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Unelte/_Creează o regulă de filtrare"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Unelte/_Creează o regulă de filtrare/_automat"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Unelte/_Creează o regulă de filtrare/pe baza câmpului _De la"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Unelte/_Creează o regulă de filtrare/pe baza câmpului _Către"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Unelte/_Creează o regulă de filtrare/pe baza câmpului _Subiect"
 
@@ -4070,39 +4066,39 @@ msgstr "_Text"
 msgid "_None"
 msgstr "_Nimic"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Sunteți offline. Clic pe pictogramă pentru a trece online."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Sunteți online. Clic pe pictogramă pentru a trece offline."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Mesajele selectate nu au putut fi combinate."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Selectați dosarul de deschis"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Opțiuni de line de comandă"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4132,7 +4128,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4162,15 +4158,15 @@ msgstr ""
 "afișează acest ajutor și ieși\n"
 "afișează versiunea și ieși"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Opțiune doar pentru Windows:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "specifică portul pentru comenzi la distanță IPC"
 
@@ -4207,27 +4203,27 @@ msgstr "S-a ajuns la sfârșitul mesajului. Continuați de la început ?"
 msgid "Search finished"
 msgstr "Căutare terminată"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Unelte/Adaugă e_xpeditorul în agendă"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Creare vizualizare mesaj...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Atașamente"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fișierul „%s”."
@@ -4284,7 +4280,7 @@ msgstr "Selectați „Verifică semnătura” pentru a verifica"
 msgid "Select an action for the attached file:\n"
 msgstr "Selectați o acținue pentru fișierul atașat:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Deschide _cu..."
 
@@ -4292,7 +4288,7 @@ msgstr "Deschide _cu..."
 msgid "_Display as text"
 msgstr "_Afișează ca text"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Salvează ca..."
 
@@ -4310,7 +4306,8 @@ msgstr "Verifi_că semnătura"
 
 # hm ? este corect selectată ?
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Nu se poate salva partea selectată din părțile multiple ale mesajului."
 
@@ -4318,11 +4315,11 @@ msgstr "Nu se poate salva partea selectată din părțile multiple ale mesajului
 msgid "Can't save the attachments."
 msgstr "Nu se pot salva atașamentele."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Deschidere cu"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6094,20 +6091,20 @@ msgstr "Elemente afișate"
 msgid " Revert to default "
 msgstr " Revino la predefinit "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Configurări filtre"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Activat"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Chiar vreți să ștergeți regula „%s” ?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Șterge regulă"
 
@@ -7267,7 +7264,7 @@ msgstr "Nu s-a găsit nicio semnătură"
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună de la „%s”"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Semnătură bună"
 
@@ -7276,7 +7273,7 @@ msgstr "Semnătură bună"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Semnătură validă, dar cheia pentru „%s” nu este de încredere"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Semnătură validă (cheia nu este de încredere)"
 
@@ -7312,7 +7309,7 @@ msgstr "Semnătură validă, dar cheia de semnătură a fost revocată"
 msgid "BAD signature from \"%s\""
 msgstr "Semnătura de la „%s” NU ESTE VALIDĂ"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Semnătura NU ESTE VALIDĂ"
 
@@ -7793,19 +7790,29 @@ msgstr "%d messaj(e) au fost filtrate."
 msgid "file %s already exists\n"
 msgstr "fișierul %s există deja\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Creare vizualizare text...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Acest mesaj este criptat, dar decriptarea lui a eșuat.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Deschide"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Nume fișier"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Acest mesaj nu poate fi afișat.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -7813,37 +7820,37 @@ msgstr ""
 "Corpul mesajului nu a putut fi afișat deoarece scrierea în fișierul temporar "
 "a eșuat.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Sal_vează acestă imagine ca..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Compune un mesaj _nou"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Copiază această ad_resă"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Adăugă în a_gendă..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Copiază această ad_resă"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Deschide cu navigator Web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Copiază această _legătură"
 
 # !!! de verificat cum arată practic !!!
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7856,7 +7863,7 @@ msgstr ""
 "\n"
 "Îl deschideți oricum ?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Avertizare de URL fals"
 
@@ -7942,6 +7949,13 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+# !!! dependent de traducerea lui Outbox !!!
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Nu se poate salva mesajul în „Trimise”."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "Message-ID creat: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Tip MIME"
 
diff --git a/po/ru.po b/po/ru.po
index 00cc0f74..0a4a1dc0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Чтение настроек учётных записей...\n"
 
@@ -229,7 +229,7 @@ msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -527,12 +527,12 @@ msgstr "procmime_get_text_content(): Ошибка преобразования �
 msgid "can't open mark file\n"
 msgstr "ошибка открытия файла пометок\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не удалось получить сообщение %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: \"%s\"\n"
@@ -660,7 +660,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -668,27 +668,27 @@ msgstr ""
 "Некоторые окна с неотправленными сообщениями открыты.\n"
 "Пожалуйста, закройте их перед изменением учётных записей."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Открытие окна редактирования учётных записей...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Создание области просмотра папок..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Создание окна редактирования учётных записей...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Редактирование учётных записей"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -697,40 +697,40 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Имя"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Изменить"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "Установить учётную запись по умолчанию"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Вы действительно хотите удалить учётную запись \"%s\"?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Без названия)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Удалить учётную запись"
 
@@ -833,7 +833,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адрес"
@@ -852,8 +852,8 @@ msgstr "Выберите папку в адресной книге"
 msgid "Auto-registered address"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/Файл"
 
@@ -873,11 +873,11 @@ msgstr "/Файл/Новый файл JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -893,21 +893,21 @@ msgstr "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
@@ -954,8 +954,8 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/Инструменты"
 
@@ -967,13 +967,13 @@ msgstr "/Инструменты/Импорт файла LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
@@ -990,7 +990,7 @@ msgid "/New _Folder"
 msgstr "/Новая папка"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1044,17 +1044,17 @@ msgstr "Адрес E-Mail"
 msgid "Search:"
 msgstr "Поиск:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытно:"
@@ -1262,7 +1262,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1318,396 +1318,396 @@ msgstr "Коричневый"
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Открыть"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Добавить..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/Файл/Отправить"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/Файл/Отправить позже"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Сохранить в папке черновиков"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Сохранить и продолжить правку"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/Файл/Вложить файл"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставить текст из файла"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставить подпись"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Добавить подпись в конец"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/Правка/Отменить"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Повторить"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить всё"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Правка/Отформатировать абзац"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Правка/Отформатировать всё сообщение"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/Вид"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/Вид/Кому"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/Вид/Копия"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/Вид/Адрес для ответа"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/Вид/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/Вид/Следовать к"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/Вид/Линейка"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вид/Настроить панель инструментов"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Кодировка"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Кодировка/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вид/Кодировка/Балтийская (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вид/Кодировка/Арабская (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Иврит (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Иврит (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллица (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Кириллица (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Кириллица\\/Украина (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллица (_Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Китайская традиционная (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/Инструменты/Запросить уведомление о расположении"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/Инструменты/Проверить орфографию"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Язык для проверки орфографии"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Вложения отсутствуют"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вложения отсутствуют. Отправить без вложений?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Проверить получателей"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Отправить сообщения по следующим адресам?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "Отправить"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1715,37 +1715,39 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Ошибка сохранения сообщения в папке отправленных."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Невозможно подписать сообщение."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Невозможно зашифровать сообщение."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Невозможно зашифровать или подписать сообщение."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1756,11 +1758,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1773,15 +1775,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1794,100 +1796,95 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "создан Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Файл не существует."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Открытие исполняемого файла"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1899,12 +1896,12 @@ msgstr ""
 "Если вы всё же хотите запустить этот файл, сохраните его на диске и "
 "убедитесь, что файл не содержит вирусов и других опасных программ."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1914,48 +1911,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2456,12 +2453,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -3310,15 +3307,15 @@ msgstr "/Файл/Экспорт в mbox-файл..."
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Очистить все корзины"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/Файл/Настройка страницы..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/Файл/Печать..."
 
@@ -3335,7 +3332,7 @@ msgstr "/Файл/Выход"
 msgid "/_Edit/Select _thread"
 msgstr "/Правка/Выделить обсуждение"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/Правка/Поиск в текущем сообщении..."
 
@@ -3552,35 +3549,35 @@ msgstr "/Вид/Перейти/Следующее выделенное цвет�
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вид/Кодировка/Западноевропейская (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Китайская традиционная (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
@@ -3588,11 +3585,11 @@ msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/Вид/Все заголовки"
 
@@ -3600,7 +3597,7 @@ msgstr "/Вид/Все заголовки"
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/Сообщение"
 
@@ -3634,16 +3631,16 @@ msgstr "/Сообщение/Отправить сообщения из очер�
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
@@ -3651,27 +3648,27 @@ msgstr "/Сообщение/Ответить"
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
@@ -3729,7 +3726,7 @@ msgstr "/Сообщение/Пометить как спам"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Сообщение/Пометить как не спам"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
@@ -3745,23 +3742,23 @@ msgstr "/Инструменты/Отфильтровать все сообщен
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
@@ -4014,40 +4011,40 @@ msgstr "Текст"
 msgid "_None"
 msgstr "Нет"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Выбор папки"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Параметры командной строки"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4077,7 +4074,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4107,15 +4104,15 @@ msgstr ""
 "отобразить этоу подсказку и выйти\n"
 "вывести информацию о версии и выйти"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Специфические для Windows настройки:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport номер порта"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "задать портдля удаленной команды IPC"
 
@@ -4152,27 +4149,27 @@ msgstr "Достигнут конец сообщения; продолжить �
 msgid "Search finished"
 msgstr "Поиск закончен"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Создание области просмотра сообщения...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Вложения"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
@@ -4229,7 +4226,7 @@ msgstr "Выберите \"Проверить подпись\" для прове
 msgid "Select an action for the attached file:\n"
 msgstr "Выберите действие для вложенного файла:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Открыть с помощью..."
 
@@ -4237,7 +4234,7 @@ msgstr "Открыть с помощью..."
 msgid "_Display as text"
 msgstr "Показать как текст"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Сохранить как..."
 
@@ -4254,7 +4251,8 @@ msgid "_Check signature"
 msgstr "Проверить подпись"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Ошибка при сохранении одного из компонентов сообщения."
 
@@ -4262,11 +4260,11 @@ msgstr "Ошибка при сохранении одного из компон�
 msgid "Can't save the attachments."
 msgstr "Ошибка при сохранении вложений."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Открыть с помощью"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6013,20 +6011,20 @@ msgstr "Отображаемые элементы"
 msgid " Revert to default "
 msgstr " Вернуть стандартные настройки "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Настройки фильтров"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Вкл."
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Вы хотите удалить правило \"%s\"?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Удаление правила"
 
@@ -7167,7 +7165,7 @@ msgstr "Подпись не найдена"
 msgid "Good signature from \"%s\""
 msgstr "Хорошая подпись от \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Хорошая подпись"
 
@@ -7176,7 +7174,7 @@ msgstr "Хорошая подпись"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпись от \"%s\" правильная, но нет доверия ключу"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Подпись правильная, но нет доверия ключу"
 
@@ -7212,7 +7210,7 @@ msgstr "Подпись правильная, но ключ был отозван
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись  от \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "ПЛОХАЯ подпись"
 
@@ -7691,55 +7689,65 @@ msgstr "%d сообщений отфильтровано."
 msgid "file %s already exists\n"
 msgstr "файл %s уже существует\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Создание области просмотра текста...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Сообщение зашифрованно, но расшифровать не удалось\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/Открыть"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Имя файла"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Невозможно отобразить сообщение.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 "Текст сообщения не может быть показан. Ошибка записи временного файла.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Сохранить изображение как..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Копировать адрес"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Добавить в адресную книгу"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Копировать адрес"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Открыть в браузере"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Копировать ссылку"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7752,7 +7760,7 @@ msgstr ""
 "\n"
 "Всё равно открыть?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Внимание - подмена URL"
 
@@ -7837,6 +7845,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Ошибка сохранения сообщения в папке отправленных."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "создан Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Тип MIME"
 
diff --git a/po/sk.po b/po/sk.po
index dabd545c..dcba7296 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Načítavam nastavenia pre všetky kontá...\n"
 
@@ -228,7 +228,7 @@ msgstr "chyba pri IMAP príkaze: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
 msgid "can't open mark file\n"
 msgstr "nemôžem otvoriť súbor so značkami\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nedá sa prijať správa %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
@@ -652,7 +652,7 @@ msgstr ""
 "programom. Ak to tak nie je, napíšte na adresu Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -660,29 +660,29 @@ msgstr ""
 "Sú otvorené okná s rozpísanými správami.\n"
 "Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia kônt."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Otváram okno pre nastavenie konta...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Vytváram okno pre nastavenie konta...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Úprava kônt"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -690,42 +690,42 @@ msgstr ""
 "Nové správy budú kontrolované v tomto poradí. Ak má byť konto kontrolované\n"
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Meno"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Upraviť"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr "Nastaviť ako východzie konto"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete zmazať toto konto?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Bez názvu"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Zmazať konto"
 
@@ -828,7 +828,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresár"
@@ -847,8 +847,8 @@ msgstr "Vyberte priečinok adresára"
 msgid "Auto-registered address"
 msgstr "Registrované pravidlá"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Súbor"
 
@@ -869,11 +869,11 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
@@ -889,21 +889,21 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
@@ -950,8 +950,8 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
@@ -964,13 +964,13 @@ msgstr "/_Nástroje/Importovať súbor _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
@@ -987,7 +987,7 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1044,17 +1044,17 @@ msgstr "E-mailová adresa"
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slepá kópia:"
@@ -1269,7 +1269,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1325,441 +1325,441 @@ msgstr "Hnedá"
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otvoriť"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prílohy"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1767,40 +1767,42 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Správa sa nedá uložiť medzi odoslané správy."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1811,12 +1813,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1825,15 +1827,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1842,103 +1844,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "vygenerovaný Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dátum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1946,12 +1943,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1961,52 +1958,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2527,12 +2524,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -3408,16 +3405,16 @@ msgstr "/_Súbor/_Exportovať do súboru mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
@@ -3434,7 +3431,7 @@ msgstr "/_Súbor/Uk_ončiť"
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
@@ -3659,42 +3656,42 @@ msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
@@ -3703,11 +3700,11 @@ msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Zobraziť/Všetky _hlavičky"
@@ -3716,7 +3713,7 @@ msgstr "/_Zobraziť/Všetky _hlavičky"
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
@@ -3752,16 +3749,16 @@ msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
@@ -3769,27 +3766,27 @@ msgstr "/Sp_ráva/O_dpovedať"
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
@@ -3849,7 +3846,7 @@ msgstr "/Sp_ráva/_Odoslať"
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
@@ -3868,23 +3865,23 @@ msgstr "/_Nástroje/_Filtrovať správy"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
@@ -4151,42 +4148,42 @@ msgstr "Text"
 msgid "_None"
 msgstr "Žiadna"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Zvoľte priečinok"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4203,7 +4200,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4220,15 +4217,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4265,27 +4262,27 @@ msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Vytváram zobrazenie správy...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
@@ -4347,7 +4344,7 @@ msgstr "Zvoľte \"Overiť podpis\" pre overenie"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/O_tvoriť čím..."
@@ -4357,7 +4354,7 @@ msgstr "/O_tvoriť čím..."
 msgid "_Display as text"
 msgstr "/_Zobraziť ako text"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/_Uložiť ako..."
@@ -4375,7 +4372,8 @@ msgid "_Check signature"
 msgstr "/Overiť _podpis"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Nemôžem uložiť časť viacdielnej správy."
 
@@ -4384,11 +4382,11 @@ msgstr "Nemôžem uložiť časť viacdielnej správy."
 msgid "Can't save the attachments."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6191,21 +6189,21 @@ msgstr "Zobrazené položky"
 msgid " Revert to default "
 msgstr " Vrátiť na východzie "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Nastavenie filtra"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naozaj chcete zmazať toto pravidlo?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Zmazať pravidlo"
 
@@ -7414,7 +7412,7 @@ msgstr "Nebol nájdený žiadny podpis"
 msgid "Good signature from \"%s\""
 msgstr "Správny podpis od \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Správny podpis"
 
@@ -7423,7 +7421,7 @@ msgstr "Správny podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7460,7 +7458,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "CHYBNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "CHYBNÝ podpis"
 
@@ -7953,59 +7951,69 @@ msgstr ""
 msgid "file %s already exists\n"
 msgstr "súbor %s už existuje\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Vytváram zobrazenie textu...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Otvoriť"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Názov súboru"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prehliadač"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8014,7 +8022,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8102,6 +8110,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Správa sa nedá uložiť medzi odoslané správy."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "vygenerovaný Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME typ"
 
diff --git a/po/sl.po b/po/sl.po
index 4d29aff7..e3e4c0ca 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak račun...\n"
 
@@ -231,7 +231,7 @@ msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -526,12 +526,12 @@ msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporočila %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -660,7 +660,7 @@ msgstr ""
 "programom; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -668,29 +668,29 @@ msgstr ""
 "Nekatera okna za sestavljanje sporočila so odprta.\n"
 "Pred urejanjem računov zaprite vsa okna za sestavljanje sporočil."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Odpiram okno za urejanje računa...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Delam mapo View...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Ustvarjam okno za urejanje računa...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Urejanje računov"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -698,42 +698,42 @@ msgstr ""
 "Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Strežnik"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Urejanje"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " Nastavi kot privzet račun "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Brez naslova"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Brisanje računa"
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Naslov"
@@ -853,8 +853,8 @@ msgstr "Izberite mapo za adresar"
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Datoteka"
 
@@ -875,11 +875,11 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -895,21 +895,21 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
@@ -956,8 +956,8 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Orodja"
 
@@ -970,13 +970,13 @@ msgstr "/_Orodja/Uvoz datoteke _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
@@ -993,7 +993,7 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1050,17 +1050,17 @@ msgstr "Elektronski naslov"
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skp:"
@@ -1274,7 +1274,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1330,442 +1330,442 @@ msgstr "Rjava"
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Odpri"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priloge"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1773,40 +1773,42 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-msgid "Can't save the message to outbox."
-msgstr "Ne morem shraniti sporočila v imenik Outbox."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1816,12 +1818,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1830,15 +1832,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1847,104 +1849,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "generiran Message-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1952,12 +1949,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1967,52 +1964,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, 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:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2531,12 +2528,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -3406,16 +3403,16 @@ msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
@@ -3433,7 +3430,7 @@ msgstr "/_Datoteka/_Končaj"
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
@@ -3658,42 +3655,42 @@ msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
@@ -3702,11 +3699,11 @@ msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pogled/Vsa _zaglavja"
@@ -3715,7 +3712,7 @@ msgstr "/_Pogled/Vsa _zaglavja"
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
@@ -3755,16 +3752,16 @@ msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
@@ -3772,27 +3769,27 @@ msgstr "/_Sporočilo/_Odgovori"
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
@@ -3853,7 +3850,7 @@ msgstr "/_Sporočilo/_Poberi novo pošto"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
@@ -3872,23 +3869,23 @@ msgstr "/_Orodja/_Filtriraj sporočila"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
@@ -4154,42 +4151,42 @@ msgstr "Besedilo"
 msgid "_None"
 msgstr "Nič"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Izberi mapo"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4206,7 +4203,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4223,15 +4220,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4268,27 +4265,27 @@ msgstr "Dosežen je konec sporočila. Naj nadaljujem z začetka?"
 msgid "Search finished"
 msgstr "Iskanje končano"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporočila...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Besedilo"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Priloge"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
@@ -4350,7 +4347,7 @@ msgstr "Izberite \"Preveri podpis\" za preverjanje"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/Odpri _z..."
@@ -4360,7 +4357,7 @@ msgstr "/Odpri _z..."
 msgid "_Display as text"
 msgstr "/_Prikaži kot besedilo"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/_Shrani kot..."
@@ -4378,7 +4375,8 @@ msgid "_Check signature"
 msgstr "/P_reveri podpis"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Ne morem shraniti dela večdelnega sporočila."
 
@@ -4387,11 +4385,11 @@ msgstr "Ne morem shraniti dela večdelnega sporočila."
 msgid "Can't save the attachments."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Odpri z"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6192,21 +6190,21 @@ msgstr "Prikazani kosi"
 msgid " Revert to default "
 msgstr "Povrni privzeto"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Nastavitev filtra"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ali res želite izbrisati to pravilo?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Izbriši pravilo"
 
@@ -7412,7 +7410,7 @@ msgstr "Noben podpis ni bil najden"
 msgid "Good signature from \"%s\""
 msgstr "Dober podpis od \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Dober podpis"
 
@@ -7421,7 +7419,7 @@ msgstr "Dober podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7458,7 +7456,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "SLAB podpis od \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "SLAB podpis"
 
@@ -7953,60 +7951,70 @@ msgstr "sporočilo %d je že v predpomnilniku.\n"
 msgid "file %s already exists\n"
 msgstr "Datoteka %s že obstaja\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Ustvarjam ogled besedila...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Odpri"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Ime datoteke"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "sporočilo ne bo sprejeto\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Skupni naslov"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8015,7 +8023,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8103,6 +8111,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Ne morem shraniti sporočila v imenik Outbox."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "generiran Message-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Tip MIME"
 
diff --git a/po/sr.po b/po/sr.po
index 794bc9b3..3c26ab91 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Čitanje konfiguracije za svaki nalog...\n"
 
@@ -232,7 +232,7 @@ msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -527,12 +527,12 @@ msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obeleženu datoteku\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\n"
@@ -660,7 +660,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -668,29 +668,29 @@ msgstr ""
 "Neki prozori za pisanje pisma su otvoreni.\n"
 "Molim, zatvorite sve prozore pre izmena naloga."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Otvaranje prozora za izmenu naloga...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Stvaranje prozora za izmenu naloga...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Izmeni naloge"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -698,42 +698,42 @@ msgstr ""
 "Nove poruke biti će proveravane ovim redom. Označite pod\n"
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Izmeni"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr "Postavi kao uobičajeni nalog "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Želite li zaista obrisati ovaj nalog?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Neimenovano"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Obriši nalog"
 
@@ -834,7 +834,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adresa"
@@ -853,8 +853,8 @@ msgstr "Odaberite direktorijum adresara"
 msgid "Auto-registered address"
 msgstr "Zabeležena pravila"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Datoteka"
 
@@ -875,11 +875,11 @@ msgstr "/_Datoteka/Novi _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -895,21 +895,21 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
@@ -956,8 +956,8 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Alati"
 
@@ -970,13 +970,13 @@ msgstr "/_Datoteka/Unesi _LDIF datoteku"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
@@ -993,7 +993,7 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1050,17 +1050,17 @@ msgstr "Adresa e-pošte"
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1268,7 +1268,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1324,442 +1324,442 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otvori"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/compose.c:581
+#: src/compose.c:582
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u direktorijum _nedovršeno"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije i nastavi da pišeš"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Prikači datoteku"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Izmeni/_Undo"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Izmeni/Sažmi trenutni _paragraf"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 
-#: src/compose.c:612
+#: src/compose.c:613
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Pregled/_Za"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Pregled/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Pregled/_Odgovori"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pregled/P_rosledi"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Len_jir"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:728
+#: src/compose.c:729
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Alati/_Izvrši"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Dodatak"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1767,41 +1767,43 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-msgid "Can't save the message to outbox."
-msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1811,12 +1813,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1825,15 +1827,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1842,104 +1844,99 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "generisan ID-poruke: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1947,12 +1944,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1962,52 +1959,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2526,12 +2523,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -3400,16 +3397,16 @@ msgstr "/_Datoteka/_Izvoz u mbox datoteku..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Štampanje..."
 
@@ -3427,7 +3424,7 @@ msgstr "/_Datoteka/I_zlaz"
 msgid "/_Edit/Select _thread"
 msgstr "/_Izmene/Odaberi _thread"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Izmne/P_retraga u trenutnoj poruci..."
 
@@ -3653,42 +3650,42 @@ msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
@@ -3697,11 +3694,11 @@ msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
@@ -3710,7 +3707,7 @@ msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Poruka"
 
@@ -3750,16 +3747,16 @@ msgstr "/_Poruka/Pošalji _odložene poruke"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
@@ -3767,27 +3764,27 @@ msgstr "/_Poruka/O_dgovor"
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
@@ -3848,7 +3845,7 @@ msgstr "/_Poruka/Prover_i novu poštu"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
@@ -3867,23 +3864,23 @@ msgstr "/_Alati/_Filtriraj poruke"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
@@ -4149,42 +4146,42 @@ msgstr "Tekst"
 msgid "_None"
 msgstr "Ništa"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite direktorijum"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4201,7 +4198,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4218,15 +4215,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4263,27 +4260,27 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Pretraga završena"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Dodatak"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -4345,7 +4342,7 @@ msgstr "Odaberite \"Proveri potpis\" da proverite"
 msgid "Select an action for the attached file:\n"
 msgstr ""
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 #, fuzzy
 msgid "Open _with..."
 msgstr "/Otvoranje _sa..."
@@ -4355,7 +4352,7 @@ msgstr "/Otvoranje _sa..."
 msgid "_Display as text"
 msgstr "/Prikaži kao _tekst"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 #, fuzzy
 msgid "_Save as..."
 msgstr "/S_ačuvaj kao"
@@ -4373,7 +4370,8 @@ msgid "_Check signature"
 msgstr "/Pro_veri potpis"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Ne mogu sačuvati deo višedelne poruke"
 
@@ -4382,11 +4380,11 @@ msgstr "Ne mogu sačuvati deo višedelne poruke"
 msgid "Can't save the attachments."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Otvori sa"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6186,21 +6184,21 @@ msgstr "Prikazane pojedinosti"
 msgid " Revert to default "
 msgstr " Vrati na uobičajeno "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Podešavanje filtera"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Zaista obrisati pravilo?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
@@ -7408,7 +7406,7 @@ msgstr "Nema potpisa"
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Dobar potpis"
 
@@ -7417,7 +7415,7 @@ msgstr "Dobar potpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -7454,7 +7452,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
@@ -7948,60 +7946,70 @@ msgstr "poruka %d već je prihvaćena.\n"
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Stvaranje pregleda teksta...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Otvori"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Ime datoteke"
+
+#: src/textview.c:1092
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web čitač"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -8010,7 +8018,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -8098,6 +8106,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "generisan ID-poruke: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME tip"
 
diff --git a/po/sv.po b/po/sv.po
index 4def5a28..ebdc9564 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Läser all konfiguration för varje konto...\n"
 
@@ -224,7 +224,7 @@ msgstr "fel vid imapkommando: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -523,12 +523,12 @@ msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 msgid "can't open mark file\n"
 msgstr "kan inte öppna markeringsfil\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte hämta meddelande %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
@@ -656,7 +656,7 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -664,29 +664,29 @@ msgstr ""
 "Några skrivfönster är öppna.\n"
 "Stäng alla skrivfönster innan du redigerar kontona."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Öppnar kontoredigeringsfönstret...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Skapar mappvy...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Skapar kontoredigeringsfönster...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Redigera konton"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -695,40 +695,40 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Namn"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " _Använd som förvalt konto "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort kontot '%s'?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Ta bort konto"
 
@@ -831,7 +831,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adress"
@@ -850,8 +850,8 @@ msgstr "Välj adressboksmapp"
 msgid "Auto-registered address"
 msgstr "Registrerade mallar"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Arkiv"
 
@@ -872,11 +872,11 @@ msgstr "/_Arkiv/Ny _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
@@ -892,21 +892,21 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
@@ -953,8 +953,8 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
@@ -967,13 +967,13 @@ msgstr "/V_erktyg/Importera _LDIF-fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
@@ -990,7 +990,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1047,17 +1047,17 @@ msgstr "E-postadress"
 msgid "Search:"
 msgstr "Sök"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Dold kopia:"
@@ -1265,7 +1265,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Notera"
 
@@ -1321,408 +1321,408 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Öppna"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visa/_Teckenkodning/_Automatisk"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Teckenkodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bilagor"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1730,41 +1730,43 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Kan inte spara meddelande i kö-mappen."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1775,11 +1777,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1792,15 +1794,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1809,101 +1811,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "skapat Meddelande-ID: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Öppnande av körbar fil"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1915,12 +1912,12 @@ msgstr ""
 "Om du vil köra den, spara den någonstans och kolla att det inte är ett virus "
 "eller något illasinnat program."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1930,48 +1927,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2486,12 +2483,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -3365,16 +3362,16 @@ msgstr "/_Arkiv/_Exportera till mbox-fil..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
@@ -3391,7 +3388,7 @@ msgstr "/_Arkiv/_Avsluta"
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
@@ -3614,36 +3611,36 @@ msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Teckenkodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
@@ -3651,11 +3648,11 @@ msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Visa/_Hela brevhuvudet"
@@ -3664,7 +3661,7 @@ msgstr "/_Visa/_Hela brevhuvudet"
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Meddelande"
 
@@ -3700,16 +3697,16 @@ msgstr "/_Meddelande/Skicka _köade meddelanden"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
@@ -3717,27 +3714,27 @@ msgstr "/_Meddelande/Sva_ra"
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
@@ -3796,7 +3793,7 @@ msgstr "/_Meddelande/Sätt som _skräppost"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelande/Sätt som inte skr_äppost"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
@@ -3812,23 +3809,23 @@ msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
@@ -4086,42 +4083,42 @@ msgstr "Text"
 msgid "_None"
 msgstr "Ingen"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Du är frånkopplad. Klicka på ikonen för att ansluta."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Du är ansluten. Klicka på ikonen för att koppla från."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Välj mapp"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4138,7 +4135,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4155,15 +4152,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4200,27 +4197,27 @@ msgstr "Slutet av meddelandet nått; fortsätta från början?"
 msgid "Search finished"
 msgstr "Sökning klar"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
@@ -4281,7 +4278,7 @@ msgstr "Välj \"Undersök signatur\" för att undersöka"
 msgid "Select an action for the attached file:\n"
 msgstr "Välj en åtgärd för den bifogade filen:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Öppna _med..."
 
@@ -4289,7 +4286,7 @@ msgstr "Öppna _med..."
 msgid "_Display as text"
 msgstr "Visa som _text"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Spara som..."
 
@@ -4306,7 +4303,8 @@ msgid "_Check signature"
 msgstr "_Undersök signatur"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Kan inte spara delen av multipart-meddelandet."
 
@@ -4314,11 +4312,11 @@ msgstr "Kan inte spara delen av multipart-meddelandet."
 msgid "Can't save the attachments."
 msgstr "Kan inte spara bilagorna."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Öppna med"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6094,21 +6092,21 @@ msgstr "Visade poster"
 msgid " Revert to default "
 msgstr " Återgå till standardinställning "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Filterinställningar"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Vill du verkligen ta bort regeln '%s'?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
@@ -7293,7 +7291,7 @@ msgstr "Ingen signatur funnen"
 msgid "Good signature from \"%s\""
 msgstr "Bra signatur från \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Bra signatur"
 
@@ -7302,7 +7300,7 @@ msgstr "Bra signatur"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Giltig signatur med nyckeln för \"%s\" är inte pålitlig"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Giltig signatur (opålitlig nyckel)"
 
@@ -7338,7 +7336,7 @@ msgstr "Signaturen giltig men signerande nyckeln har återkallats"
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "FELAKTIG signatur"
 
@@ -7827,54 +7825,64 @@ msgstr "%d meddelande(n) har filtrerats."
 msgid "file %s already exists\n"
 msgstr "filen %s finns redan\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Skapar textvy...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Öppna"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Filnamn"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Detta meddelande kan inte visas.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Lägg till adress_boken"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Öppna med Webbläsare"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7887,7 +7895,7 @@ msgstr ""
 "\n"
 "Öppna den ändå?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
@@ -7974,6 +7982,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Kan inte spara meddelande i kö-mappen."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "skapat Meddelande-ID: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME-typ"
 
diff --git a/po/tr.po b/po/tr.po
index 6de16641..4601c9e9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-27 09:56+0200\n"
 "Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap için tüm yapılandırma dosyaları okunuyor...\n"
 
@@ -228,7 +228,7 @@ msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -526,12 +526,12 @@ msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 msgid "can't open mark file\n"
 msgstr "işaret dosyası açılamadı\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti alınamadı\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\n"
@@ -655,7 +655,7 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yazınız."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -663,27 +663,27 @@ msgstr ""
 "Bazı düzenleme pencereleri açık.\n"
 "Lütfen tüm düzenleme pencerelerini kapattıktan sonra hesapları düzenleyin."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Hesap düzenleme penceresi açılıyor...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Dizin ağacı oluşturuluyor. Lütfen bekleyin..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Dizin ağacı oluşturulamadı."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Hesap düzenleme penceresi oluşturuluyor...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Hesapları düzenle"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -692,40 +692,40 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ad"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Düzenle"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " _Öntanımlı hesap olarak ata "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "'%s' hesabını gerçekten silmek istiyor musunuz?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Başlıksız)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Hesabı sil"
 
@@ -828,7 +828,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Adres"
@@ -846,8 +846,8 @@ msgstr "Adres Defteri Dizinini Seç"
 msgid "Auto-registered address"
 msgstr "Otomatik-kaydedilmiş adres"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Dosya"
 
@@ -867,11 +867,11 @@ msgstr "/_Dosya/Yeni _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _LDAP Sunucu"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
@@ -887,21 +887,21 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
@@ -945,8 +945,8 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
@@ -958,13 +958,13 @@ msgstr "/A_raçlar/_LDIF dosyasını içe aktar"
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_CSV dosyasını içe aktar"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
@@ -981,7 +981,7 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1035,17 +1035,17 @@ msgstr "E-posta adresi"
 msgid "Search:"
 msgstr "Ara:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1251,7 +1251,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Not"
 
@@ -1307,396 +1307,396 @@ msgstr "Kahverengi"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Aç"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizine kaydet"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Dosya/İmzayı _sonuna ekle"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Bulunulan paragrafı sar"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/_Görünüm/_Yanıt Adresi"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr ""
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Görünüm/Araç çubuğunu _özelleştir"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/Karakter _kodlaması"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Görünüm/Karakter _kodlaması/_Otomatik"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/Karakter _kodlaması/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Görünüm/Karakter _kodlaması/7 bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/Karakter_kodlaması/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/Karakter_kodlaması/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/Karakter_kodlaması/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/Karakter_kodlaması/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/Karakter_kodlaması/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/Karakter_kodlaması/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/Karakter_kodlaması/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Görünüm/Karakter_kodlaması/Arapça (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Görünüm/Karakter_kodlaması/Arapça (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/Karakter_kodlaması/İbranice (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/Karakter_kodlaması/İbranice (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/Karakter_kodlaması/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/Karakter_kodlaması/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/Karakter_kodlaması/Basitleştirilmiş Çince (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/Karakter_kodlaması/Basitleştirilmiş Çince (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/Karakter_kodlaması/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/Karakter_kodlaması/Korece (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/Karakter_kodlaması/Tayca (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/Karakter_kodlaması/Tayca (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/A_raçlar/Okundu_bilgisi iste"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/A_raçlar/Yazım _denetle"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Yazım denetleme dili _ata"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı iletinin bir bölümü alınamadı"
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti Oluştur%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Boş konu satırı"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Ek dosya eksik"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Hiç ek yok. Yine de eksiz göndermek istiyor musunuz?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Alıcıları kontrol et"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Gerçekten aşağıdaki adreslere bu e-postayı gönderelim mi?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Konu:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "_Gönder"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1704,37 +1704,39 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "İleti, giden kutusuna kaydedilemiyor."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "İleti imzalanamadı."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "İleti şifrelenemedi."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "İleti şifrelenemedi ya da imzalanamadı."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1745,11 +1747,11 @@ msgstr ""
 "\n"
 " Yine de %s olarak gönderelim mi?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Kodlama çevirim hatası"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1762,15 +1764,15 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Satır uzunlık sınırı"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Bcc ile Şifreleme"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1784,99 +1786,94 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "%s dosyası açılamadı."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "İleti numarası oluşturuldu: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP İmzala"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP Şifrele"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Veri tipi"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Dosya bulunamadı."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Çalıştırılabilir dosya açılıyor"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1888,12 +1885,12 @@ msgstr ""
 "Eğer açmak istiyorsanız, bir yere kaydedin ve virüs ya da benzer bir art "
 "niyetli program olmadığına emin olun."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1902,48 +1899,48 @@ msgstr ""
 "Harici düzenleyici hala çalışıyor.\n"
 "Bu süreci zorla sonlandırayım mı (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Araç çubuğunu_özelleştir..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Dosyaları seç"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "İletiyi kaydet"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Taslak dizine kaydedilsin mi?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Ka_ydetmeden kapat"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "De_ğiştir"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_İçer"
 
@@ -2443,12 +2440,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -3293,15 +3290,15 @@ msgstr "/_Dosya/_E-posta verisi _dışa aktar..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/_Dosya/_Sayfa ayarları"
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
@@ -3318,7 +3315,7 @@ msgstr "/_Dosya/Çı_k"
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Bulunula_n iletide bul..."
 
@@ -3535,35 +3532,35 @@ msgstr "/_Görünüm/_Git/Son_raki etiketli ileti"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Karakter kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Görünüm/_Karakter kodlama/Batı Avrupa (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Karakter kodlaması/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/Karakter kodlaması/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/Karakter kodlaması/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/Karakter kodlaması/Geleneksel Çince (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/Karakter kodlaması/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/Karakter kodlaması/Korece (ISO-2022-KR)"
 
@@ -3571,11 +3568,11 @@ msgstr "/_Görünüm/Karakter kodlaması/Korece (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/_Görünüm/Tüm _başlıklar"
 
@@ -3583,7 +3580,7 @@ msgstr "/_Görünüm/Tüm _başlıklar"
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/İ_leti"
 
@@ -3617,16 +3614,16 @@ msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
@@ -3634,27 +3631,27 @@ msgstr "/İ_leti/Yanıtl_a"
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
@@ -3710,7 +3707,7 @@ msgstr "/İ_leti/Gereksiz posta olarak işaretle"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/İ_leti/Gereksiz _olmayan posta olarak işaretle"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
@@ -3726,23 +3723,23 @@ msgstr "/A_raçlar/_Dizin içindeki tüm iletileri süz"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm iletileri süzgeçten geçir"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Konuya göre oluştur"
 
@@ -3992,39 +3989,39 @@ msgstr "_Metin"
 msgid "_None"
 msgstr "_Hiçbiri"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Seçili iletiler birleştirilemedi."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Açılacak dizini seç"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Komut satırı seçenekleri"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: sylpheed [SEÇENEK]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4054,7 +4051,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4082,15 +4079,15 @@ msgstr ""
 "hata ayıklama kipi\n"
 "sürüm bilgisini göster ve çık"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Yalnız Windows'ta geçerli seçenek:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport kapıno (portno)"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "IPC uzak komutları için kapı (port) belirt"
 
@@ -4127,27 +4124,27 @@ msgstr "İletinin sonuna ulaşıldı, başından başlansın mı?"
 msgid "Search finished"
 msgstr "Arama tamamlandı"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "İleti görüntüsü oluşturuluyor...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Metin"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Ekler"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "İleti Görünümü - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
@@ -4204,7 +4201,7 @@ msgstr "Kontol etmek için \"İmzayı Kontrol Et\"i seçn"
 msgid "Select an action for the attached file:\n"
 msgstr "Ekli dosya için bir eylem seçin:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "_Birlikte aç..."
 
@@ -4212,7 +4209,7 @@ msgstr "_Birlikte aç..."
 msgid "_Display as text"
 msgstr "_Metin olarak görüntüle"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Farklı kaydet..."
 
@@ -4229,7 +4226,8 @@ msgid "_Check signature"
 msgstr "İ_mzayı denetle"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "çoklu iletinin parçası saklanmaıyor."
 
@@ -4237,11 +4235,11 @@ msgstr "çoklu iletinin parçası saklanmaıyor."
 msgid "Can't save the attachments."
 msgstr "Ek dosyalar kaydedilemedi."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Birlikte aç"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5978,20 +5976,20 @@ msgstr "Görüntülenen öğeler"
 msgid " Revert to default "
 msgstr " Öntanımlıya geçiş yap "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Süzgeç ayarları"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Etkin"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "'%s' kuralını gerçekten silmek istiyor musunuz?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Kuralı sil"
 
@@ -7129,7 +7127,7 @@ msgstr "İmza bulunamadı"
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"'ten iyi imza"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "İyi imza"
 
@@ -7138,7 +7136,7 @@ msgstr "İyi imza"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "İmza geçerli fakat anahtar \"%s\" güvenilir değil"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Geçerli imza (güvenilir olmayan anahtar)"
 
@@ -7174,7 +7172,7 @@ msgstr "İmza geçerli ama imza anahtarı iptal edilmiş"
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" ten KÖTÜ imza"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "KÖTÜ imza"
 
@@ -7650,53 +7648,63 @@ msgstr "%d ileti süzüldü."
 msgid "file %s already exists\n"
 msgstr "%s dosyası zaten var\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Metin görünüm oluşturuluyor...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Bu ileti şifrelenmiş ama şifre açılamadı.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Aç"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Dosya adı"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Bu ileti görüntülenemiyor.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr "İleti gövdesi gösterilemedi çünkü geçici dosyaya yazılamadı.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Bu resmi farklı ka_ydet..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Yeni ileti düze_nle"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "Bu adr_ese yanıtla"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Adres defterine ek_le..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Bu ad_resi kopyala"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Web tarayıcı ile aç"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Bu ba_ğlantıyı kopyala"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7709,7 +7717,7 @@ msgstr ""
 "\n"
 "Yine de açılsın mı?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Sahte URL uyarısı"
 
@@ -7790,3 +7798,9 @@ msgstr ""
 #: plugin/attachment_tool/attachment_tool.c:272
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
+
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "İleti, giden kutusuna kaydedilemiyor."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "İleti numarası oluşturuldu: %s\n"
diff --git a/po/uk.po b/po/uk.po
index c2a4c75f..55b39af7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+0900\n"
 "PO-Revision-Date: 2011-01-28 01:43+0300\n"
 "Last-Translator: Vladimir Smolyar <v_2e@ukr.net>\n"
 "Language-Team: Ukrainian\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Poedit-Language: Ukrainian\n"
 "X-Poedit-Country: UKRAINE\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Читаємо конфігурацію для кожного запису...\n"
 
@@ -228,7 +228,7 @@ msgstr "помилка при виконанні команди imap: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -526,12 +526,12 @@ msgstr "procmime_get_text_content(): Перетворення коду не вд
 msgid "can't open mark file\n"
 msgstr "не вдалося відкрити файл позначок\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не вдалося отримати повідомлення %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "хибна команда друку: \"%s\"\n"
@@ -658,7 +658,7 @@ msgstr ""
 "програмою; якщо це не так, пишіть у Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -666,27 +666,27 @@ msgstr ""
 "Відкрито деякі вікна з новими листами.\n"
 "Закрийте їх, будь-ласка, перш ніж редагувати облікові записи."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Відкриття вікна редагування облікового запису...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 msgid "Creating folder tree. Please wait..."
 msgstr "Створення дерева тек... Будь ласка, зачекайте..."
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 msgid "Creation of the folder tree failed."
 msgstr "Не вдалося створити дерево тек."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Створення вікна редагування облікового запису...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Редагування облікових записів"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -694,40 +694,40 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці \"G\"\n"
 "записи, які перевірятимуться через \"Отримати всі\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Ім'я"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Редагувати"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "Встановити як запис за замовчуванням"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ви дійсно бажаєте видалити запис \"%s\"?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(БезНазви)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Видалення облікового запису"
 
@@ -830,7 +830,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додання адреси до Книги"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Адреса"
@@ -848,8 +848,8 @@ msgstr "Обeріть теку Адресної Книги"
 msgid "Auto-registered address"
 msgstr "Адреса, зареєстрована автоматично"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/Файл"
 
@@ -869,11 +869,11 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -889,21 +889,21 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
@@ -947,8 +947,8 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/Інструменти"
 
@@ -960,13 +960,13 @@ msgstr "/Інструменти/Імпортувати файл LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
@@ -983,7 +983,7 @@ msgid "/New _Folder"
 msgstr "/Нова тека"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1037,17 +1037,17 @@ msgstr "Адреса e-mail"
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Приховано:"
@@ -1250,7 +1250,7 @@ msgstr "Спільна адреса"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1306,396 +1306,396 @@ msgstr "Коричневий"
 msgid "None"
 msgstr "Немає"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Відкрити"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/Файл/Надіслати"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/Файл/Надіслати пізніше"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти у теці чернеток"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Приєднати підпис"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Відмінити дію"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Повторити дію"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Перенести поточний абзац"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Перенести усі довгі рядки"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автоматичне перенесення"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_View/_Reply-To"
 msgstr "/Вигляд/Зворотна адреса"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 msgid "/_View/_Followup-To"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:625
+#: src/compose.c:626
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вигляд/Налаштувати панель інструментів"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодування"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вигляд/Кодування/_Aвтоматичне"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодування/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодування/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодування/Unicode (UT_F-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодування/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодування/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодування/Центральноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодування/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодування/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вигляд/Кодування/Балтійська (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодування/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вигляд/Кодування/Арабська (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вигляд/Кодування/Арабська (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодування/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодування/Єврейська (_Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодування/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодування/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодування/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодування/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодування/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодування/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодування/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодування/Спрощена китайська (_GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодування/Традиційна китайська (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодування/Корейська (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодування/Тайська (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодування/Тайська (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr "/Інструменти/Запросити підтвердження прочитання"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/Інструменти/Перевірка правопису"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Не вдалося отримати частину тексту\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі відповіді/пересилання."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалося отримати розмір %s\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалося прочитати %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалося отримати одну з частин листа."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле \"Тема\" порожнє. Все ж послати?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 msgid "Attachment is missing"
 msgstr "Бракує вкладення"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вкладення немає. Послати без вкладень?"
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr "Перевірити отримувачів"
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 msgid "Really send this mail to the following addresses?"
 msgstr "Дійсно надіслати цю пошту на наступні адреси?"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 msgid "_Send"
 msgstr "Надіслати"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "не вдалося отримати список отримувачів."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1703,37 +1703,39 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь ласка, запис перед відправкою."
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилася помилка під час надсилання листа до %s ."
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "Не вдалося зберегти листа у теці Вихідних."
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалося знайти ключа, відповідного обраному ідентифікатору \"%s\"."
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 msgid "Can't sign the message."
 msgstr "Не вдалося підписати листа."
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 msgid "Can't encrypt the message."
 msgstr "Не вдалося зашифрувати листа."
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 msgid "Can't encrypt or sign the message."
 msgstr "Не вдалося зашифрувати чи підписати листа."
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "не вдалося змінити права доступу файлу\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1744,11 +1746,11 @@ msgstr ""
 "%s на %s.\n"
 "Все одно надіслати у %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1761,15 +1763,15 @@ msgstr ""
 "\n"
 "Все одно надіслати?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1783,99 +1785,94 @@ msgstr ""
 "\n"
 "Все одно послати?"
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "не вдалося видалити старий лист\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "Додання листа до черги...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "не вдалося знайти теку черги\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "не вдалося додати листа до черги\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалося відкрити файл %s."
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "генерований ідентифікатор листа: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Відкриття вікна створення листа...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 msgid "Data type"
 msgstr "Тип даних"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 msgid "File not exist."
 msgstr "Файл не існує."
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Відкриваємо виконуваний файл"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1887,12 +1884,12 @@ msgstr ""
 "Якщо бажаєте запустити цей файл, збережіть його і переконайтеся, що це не "
 "вірус чи щось шкідливе."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: \"%s\"\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1901,48 +1898,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово перервати процес (pid: %d)?\n"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Не вдалося додати листа до черги."
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти у теці чернеток?"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Бажаєте застосувати шаблон \"%s\" ?"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2441,12 +2438,12 @@ msgstr "Встановлення інформації теки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлення інформації теки..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перегляд теки %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перегляд теки %s ..."
@@ -3291,15 +3288,15 @@ msgstr "/Файл/Експортувати пошту..."
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити весь кошик"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 msgid "/_File/Page set_up..."
 msgstr "/Файл/Налаштування сторінки..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
@@ -3316,7 +3313,7 @@ msgstr "/Файл/Вийти"
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі..."
 
@@ -3534,35 +3531,35 @@ msgstr "/Вигляд/Перейти до/Наступного листа, ви�
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої теки..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодування/_Aвтовизначення"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вигляд/Кодування/Західноєвропейська (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодування/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодування/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодування/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодування/Традиційна китайська (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодування/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодування/Корейська (ISO-2022-KR)"
 
@@ -3570,11 +3567,11 @@ msgstr "/Вигляд/Кодування/Корейська (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити у новому вікні"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 msgid "/_View/All _headers"
 msgstr "/Вигляд/Усі заголовки"
 
@@ -3582,7 +3579,7 @@ msgstr "/Вигляд/Усі заголовки"
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/Лист"
 
@@ -3616,16 +3613,16 @@ msgstr "/Лист/Відіслати відкладені листи"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати нового листа"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
@@ -3633,27 +3630,27 @@ msgstr "/Лист/Відповісти"
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/усім"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/у список розсилки"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переадресувати"
 
@@ -3709,7 +3706,7 @@ msgstr "/Лист/Вважати мотлохом"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Лист/Не вважати мотлохом"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
@@ -3725,23 +3722,23 @@ msgstr "/Інструменти/Фільтрувати всі листи у те
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем \"Від\""
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем \"Кому\""
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем \"Тема\""
 
@@ -3992,39 +3989,39 @@ msgstr "Текст"
 msgid "_None"
 msgstr "Немає"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr "Обрані повідомлення не можна об'єднати."
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 msgid "Select folder to open"
 msgstr "Оберіть теку для відкриття"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Використання: sylpheed [ОПЦІЯ]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4054,7 +4051,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4084,15 +4081,15 @@ msgstr ""
 "показати цю довідку і вийти\n"
 "показати інформацію про версію і вийти"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr "Опція тільки для Windows:"
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr "--ipcport порт"
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport порт      вказати порт для віддалених команд IPC"
 
@@ -4129,27 +4126,27 @@ msgstr "Досягнуто кінця листа; продовжити з поч
 msgid "Search finished"
 msgstr "Пошук закінчено"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Створюємо область перегляду листа...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Вкладення"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалося зберегти файл \"%s\"."
@@ -4206,7 +4203,7 @@ msgstr "Оберіть \"Перевірити підпис\", щоб зроби�
 msgid "Select an action for the attached file:\n"
 msgstr "Оберіть дію для приєднаного файла:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Відкрити з"
 
@@ -4214,7 +4211,7 @@ msgstr "Відкрити з"
 msgid "_Display as text"
 msgstr "Показати як текст"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "Зберегти як..."
 
@@ -4231,7 +4228,8 @@ msgid "_Check signature"
 msgstr "Перевірити підпис"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Не вдалося зберегти одну з частин листа."
 
@@ -4239,11 +4237,11 @@ msgstr "Не вдалося зберегти одну з частин листа
 msgid "Can't save the attachments."
 msgstr "Не вдалося зберегти приєднані файли."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Відкрити з"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5975,20 +5973,20 @@ msgstr "Показані елементи"
 msgid " Revert to default "
 msgstr " Повернути стандартні "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 msgid "Filter settings"
 msgstr "Налаштування фільтра"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Ввімкнено"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Справді бажаєте видалити правило \"%s\"?"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Видалити правило"
 
@@ -7128,7 +7126,7 @@ msgstr "Підпису не знайдено"
 msgid "Good signature from \"%s\""
 msgstr "Добрий підпис від \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Добрий підпис"
 
@@ -7137,7 +7135,7 @@ msgstr "Добрий підпис"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Належний підпис, але ключ для  \"%s\"  не перевірений"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Належний підпис (неперевірений ключ)"
 
@@ -7173,7 +7171,7 @@ msgstr "Належний підпис, але ключ відкликано"
 msgid "BAD signature from \"%s\""
 msgstr "ПОГАНИЙ підпис від \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "ПОГАНИЙ підпис"
 
@@ -7650,54 +7648,64 @@ msgstr "%d листів відфільтровано."
 msgid "file %s already exists\n"
 msgstr "файл %s вже існує\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Створення області перегляду тексту...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr "Цей лист зашифровано і не вдалося розшифрувати.\n"
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/Відкрити"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Ім'я файлу"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Цей лист неможливо відобразити.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 "Неможливо показати тіло листа через невдачу запису у тимчасовий файл.\n"
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "Зберегти зображення як..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Написати нового листа"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 msgid "R_eply to this address"
 msgstr "Відповісти на цю адресу"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Додати до адресної книги"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "Копіювати цю адресу"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "Відкрити Web-браузером"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Скопіювати посилання"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7710,7 +7718,7 @@ msgstr ""
 "\n"
 "Все ж відкрити?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Попередження про підміну URL"
 
@@ -7792,6 +7800,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Не вдалося зберегти листа у теці Вихідних."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "генерований ідентифікатор листа: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Тип MIME"
 
diff --git a/po/vi.po b/po/vi.po
index a06a3cdb..a799c706 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "Đang đọc mọi cấu hình cho mỗi tài khoản...\n"
 
@@ -224,7 +224,7 @@ msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv không thể chuyển UTF-7 sang %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): Chuyển đổi mã thất bại.\n"
 msgid "can't open mark file\n"
 msgstr "không thể mở tập tin đánh dấu\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "không thể lấy thư %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Lệnh in không hợp lệ: `%s'\n"
@@ -639,7 +639,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -647,29 +647,29 @@ msgstr ""
 "Một số cửa sổ soạn thảo đang mở.\n"
 "Hãy đóng mọi cửa sổ soạn thảo trước khi sửa tài khoản."
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "Mở cửa sổ sửa tài khoản...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "Đang tạo khung thư mục...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "Việc làm lại cây thư mục thất bại."
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "Đang tạo cửa sổ sửa tài khoản...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "Sửa tài khoản"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -677,40 +677,40 @@ msgstr ""
 "Các thư mới sẽ được kiểm tra theo thứ tự này. Đánh dấu các hộp\n"
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "Tên"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "Giao thức"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "Máy chủ"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "Soạn"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr " Đặt là_m tài khoản mặc định "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Bạn có thực sự muốn xoá tài khoản '%s' không?"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(Chưa đặt tên)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "Xoá tài khoản"
 
@@ -813,7 +813,7 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "Địa chỉ"
@@ -832,8 +832,8 @@ msgstr "Chọn thư mục sổ địa chỉ"
 msgid "Auto-registered address"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/_Tập tin"
 
@@ -853,11 +853,11 @@ msgstr "/_Tập tin/_JPilot mới"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
@@ -873,21 +873,21 @@ msgstr "/_Tập tin/_Xoá"
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
@@ -934,8 +934,8 @@ msgstr "/Đị_a chỉ/_Soạn"
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
@@ -948,13 +948,13 @@ msgstr "/_Công cụ/_Nhập tập tin LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
@@ -971,7 +971,7 @@ msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1027,17 +1027,17 @@ msgstr "Địa chỉ email"
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1247,7 +1247,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1303,403 +1303,403 @@ msgstr "Nâu"
 msgid "None"
 msgstr "Không"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Mở"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/Thê_m..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/_Tập tin/_Gửi"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/_Tập tin/Gửi _sau"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/_Tập tin/Lưu vào thư mục _nháp"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/_Tập tin/Lưu và _tiếp tục soạn"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/_Tập tin/Đính _kèm tập tin"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/_Tập tin/_Chèn tập tin"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/_Tập tin/Chèn _chữ kí"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_File/A_ppend signature"
 msgstr "/_Tập tin/Thêm _chữ kí"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/_Soạn/_Hoàn tác"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/_Soạn/Ch_uyển tác"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/_Soạn/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/_Soạn/_Cắt"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/_Soạn/Chọ_n tất cả"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Soạn/_Khuôn dòng đoạn hiện tại"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Soạn/Khuôn _mọi dòng dài"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/_Xem"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/_Xem/_Người nhận"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/_Xem/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/_Xem/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Xem/_Hồi âm cho"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Xem/Tiế_p sau"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/_Xem/_Thước kẻ"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/_Xem/Đí_nh kèm"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Xem/Mã _kí tự/_Tự động"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Xem/Mã _kí tự/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Xem/Mã _kí tự/Trung Âu (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Xem/Mã _kí tự/Hi Lạp (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Xem/Mã _kí tự/A-rập (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Xem/Mã _kí tự/Thổ Nhĩ Kì (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Xem/Mã _kí tự/Hán giản thể (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Công cụ/Soạ_n với chương trình ngoài"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Công cụ/Chữ _kí PGP"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Công cụ/Mã hoá _PGP"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "/_Tools/_Check spell"
 msgstr "/_Công cụ/Kiểm tra _chính tả"
 
-#: src/compose.c:734
+#: src/compose.c:735
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, 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:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Đính kèm"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,40 +1707,42 @@ 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:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, 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:3573
-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:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, 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:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1751,11 +1753,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1768,15 +1770,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1785,101 +1787,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "đã tạo ID của thư: %s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Thời gian"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 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:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "Đang mở tập tin chạy"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1890,12 +1887,12 @@ msgstr ""
 "Nếu bạn muốn chạy tập tin, lưu nó vào đâu đó và đảm bảo nó không bị nhiễm vi-"
 "rút hay là chương trình có hại."
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, 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:6743
+#: src/compose.c:6762
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1904,48 +1901,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:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 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:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, 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:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2459,12 +2456,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -3334,16 +3331,16 @@ msgstr "/_Tập tin/_Xuất khẩu tập tin mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Tập tin/Đổ _rác"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/_Tập tin/I_n..."
 
@@ -3360,7 +3357,7 @@ msgstr "/_Tập tin/Th_oát"
 msgid "/_Edit/Select _thread"
 msgstr "/_Soạn/_Chọn luồng"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Soạn/_Tìm trong thư hiện tại..."
 
@@ -3582,35 +3579,35 @@ msgstr "/_Xem/Đi _tới/Thư tiếp th_eo (đã gán nhãn)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Xem/Mã _kí tự/_Tự động xác định"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Xem/Mã _kí tự/Đông Âu (Windows-1252)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
@@ -3618,11 +3615,11 @@ msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Xem/Mọi _header"
@@ -3631,7 +3628,7 @@ msgstr "/_Xem/Mọi _header"
 msgid "/_View/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/_Thư"
 
@@ -3667,16 +3664,16 @@ msgstr "/_Thư/_Nhận/_Gửi thư đang xếp hàng"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/_Thư/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/_Thư/_Viết thư mới"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/_Thư/_Hồi âm"
 
@@ -3684,27 +3681,27 @@ msgstr "/_Thư/_Hồi âm"
 msgid "/_Message/Repl_y to"
 msgstr "/_Thư/Hồi â_m tới"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Thư/Hồi â_m tới/_tất cả"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Thư/Hồi â_m tới/_người gửi"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Thư/Hồi â_m tới/_hộp thư chung"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/_Thư/_Chuyển tiếp"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Thư/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/_Thư/Chu_yển hướng"
 
@@ -3762,7 +3759,7 @@ msgstr "/_Thư/Đánh dấu là thư _rác"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Thư/Đánh dấu _không là thư rác"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/_Thư/S_oạn lại"
 
@@ -3778,23 +3775,23 @@ msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Công cụ/Lọ_c các thư đã chọn"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
@@ -4051,40 +4048,40 @@ msgstr "Văn bản"
 msgid "_None"
 msgstr "Không"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Chọn thư mục"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4114,7 +4111,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4144,15 +4141,15 @@ msgstr ""
 "hiện thông tin trợ giúp này và thoát\n"
 "đưa ra thông tin phiên bản và thoát"
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4189,27 +4186,27 @@ msgstr "Đã đến cuối thư; tiếp tục từ đầu thư?"
 msgid "Search finished"
 msgstr "Đã tìm xong"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Công cụ/Thêm người gửi vào _sổ địa chỉ"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "Đang tạo khung xem thư...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "Văn bản"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "Đính kèm"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
@@ -4270,7 +4267,7 @@ msgstr "Chọn \"Kiểm tra chữ kí\" để kiểm tra"
 msgid "Select an action for the attached file:\n"
 msgstr "Chọn một hành động cho tập tin đính kèm:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "Mở _với..."
 
@@ -4278,7 +4275,7 @@ msgstr "Mở _với..."
 msgid "_Display as text"
 msgstr "_Hiển thị ở dạng văn bản thuần tuý"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "_Lưu là..."
 
@@ -4295,7 +4292,8 @@ msgid "_Check signature"
 msgstr "_Kiểm tra chữ kí"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "Không thể lưu thành phần của thư nhiều phần."
 
@@ -4303,11 +4301,11 @@ msgstr "Không thể lưu thành phần của thư nhiều phần."
 msgid "Can't save the attachments."
 msgstr "Không thể lưu tập tin đính kèm."
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "Mở với"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6065,21 +6063,21 @@ msgstr "Các mục đã hiển thị"
 msgid " Revert to default "
 msgstr " Dùng dạng mặc định "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "Thiết lập bộ lọc"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "Cho phép"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Bạn có thực sự muốn xoá quy tắc '%s' không"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "Xoá quy tắc"
 
@@ -7251,7 +7249,7 @@ msgstr "Không thấy chữ kí nào"
 msgid "Good signature from \"%s\""
 msgstr "Chữ kí chuẩn từ \"%s\""
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "Chữ kí chuẩn"
 
@@ -7260,7 +7258,7 @@ msgstr "Chữ kí chuẩn"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Chữ kí hợp lệ nhưng khoá ch \"%s\" không tin cậy"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "Chữ kí hợp lệ (chưa tin cậy)"
 
@@ -7296,7 +7294,7 @@ msgstr "Chữ kí hợp lệ nhưng khoá để kí đã bị thu hồi"
 msgid "BAD signature from \"%s\""
 msgstr "Chữ kí GIẢ từ \"%s\""
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "Chữ kí GIẢ"
 
@@ -7783,54 +7781,64 @@ msgstr "%d thư đã được lọc."
 msgid "file %s already exists\n"
 msgstr "tập tin %s đã có trước\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "Đang tạo khung xem văn bản...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/_Mở"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "Tên tập tin"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "Không thể hiển thị được thư này.\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "Thêm vào _sổ địa chỉ..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "_Mở với trình duyệt web"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "Sao chép liên _kết này"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7843,7 +7851,7 @@ msgstr ""
 "\n"
 "Vẫn mở nó?"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "Cảnh báo URL lừa đảo"
 
@@ -7926,6 +7934,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "Không thể lưu thư vào hộp gửi (outbox)."
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "đã tạo ID của thư: %s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "Kiểu MIME"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 727ea06e..1a6af620 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "正在读取所有帐号的配置...\n"
 
@@ -228,7 +228,7 @@ msgstr "执行IMAP命令时发生错误：CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -520,12 +520,12 @@ msgstr "procmime_get_text_content()：代码转换失败。\n"
 msgid "can't open mark file\n"
 msgstr "无法打开标记文件\n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\n"
@@ -649,7 +649,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -657,29 +657,29 @@ msgstr ""
 "一些撰写窗口已打开。\n"
 "在编辑帐号前，请关闭所有的撰写窗口。"
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "正在打开帐号编辑窗口...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "正在创建文件夹视图...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "正在创建帐号编辑窗口...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "编辑帐号"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -687,42 +687,42 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "名称"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "协议"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "服务器"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "编辑"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 #, fuzzy
 msgid " _Set as default account "
 msgstr " 设为默认帐号 "
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您真的要删除该帐号吗？"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 #, fuzzy
 msgid "(Untitled)"
 msgstr "无标题"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "删除帐号"
 
@@ -825,7 +825,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
@@ -844,8 +844,8 @@ msgstr "选择地址簿文件夹"
 msgid "Auto-registered address"
 msgstr "已注册的规则"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/文件(_F)"
 
@@ -866,11 +866,11 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
@@ -886,21 +886,21 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
@@ -947,8 +947,8 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
@@ -961,13 +961,13 @@ msgstr "/工具(_T)/导入LDIF文件(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
@@ -984,7 +984,7 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1041,17 +1041,17 @@ msgstr "电子邮件地址"
 msgid "Search:"
 msgstr "搜索"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件抄送："
@@ -1256,7 +1256,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "注意"
 
@@ -1312,412 +1312,412 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/打开(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附件"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1725,40 +1725,42 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "无法将该邮件保存到发件箱。"
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1768,12 +1770,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1782,15 +1784,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1799,103 +1801,98 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "生成邮件标识号：%s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "日期"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1903,12 +1900,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1918,51 +1915,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2479,12 +2476,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -3347,16 +3344,16 @@ msgstr "/文件(_F)/导出到mbox文件(_E)..."
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空废件箱(_T)"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
@@ -3373,7 +3370,7 @@ msgstr "/文件(_F)/退出(_X)"
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
@@ -3597,36 +3594,36 @@ msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
@@ -3634,11 +3631,11 @@ msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有标题(_H)"
@@ -3647,7 +3644,7 @@ msgstr "/查看(_V)/所有标题(_H)"
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
@@ -3683,16 +3680,16 @@ msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
@@ -3700,27 +3697,27 @@ msgstr "/邮件(_M)/回复(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
@@ -3781,7 +3778,7 @@ msgstr "/邮件(_M)/接收新邮件(_i)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
@@ -3798,23 +3795,23 @@ msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
@@ -4075,42 +4072,42 @@ msgstr "文本"
 msgid "_None"
 msgstr "没有"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "选择文件夹"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4127,7 +4124,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4144,15 +4141,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4189,27 +4186,27 @@ msgstr "已查找到邮件结尾；从开头继续？"
 msgid "Search finished"
 msgstr "搜索结束"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "文本"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -4271,7 +4268,7 @@ msgstr "选择“检查签名”来检查"
 msgid "Select an action for the attached file:\n"
 msgstr "选择对附件文件的操作：\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "打开方式(_W)..."
 
@@ -4279,7 +4276,7 @@ msgstr "打开方式(_W)..."
 msgid "_Display as text"
 msgstr "作为文本显示(_D)"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "另存为(_S)..."
 
@@ -4296,7 +4293,8 @@ msgid "_Check signature"
 msgstr "检查签名(_C)"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "无法保存分块邮件的分块。"
 
@@ -4305,11 +4303,11 @@ msgstr "无法保存分块邮件的分块。"
 msgid "Can't save the attachments."
 msgstr "无法保存文件“%s”'。"
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "打开方式"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6095,21 +6093,21 @@ msgstr "显示的项目"
 msgid " Revert to default "
 msgstr " 还原为默认值 "
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "过滤设定"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "您确实要删除该规则吗？"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "删除规则"
 
@@ -7295,7 +7293,7 @@ msgstr "没有找到签名"
 msgid "Good signature from \"%s\""
 msgstr "来自“%s”的正确签名"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "正确的签名"
 
@@ -7304,7 +7302,7 @@ msgstr "正确的签名"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "签名有效，但是“%s”的密钥不被信任"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "签名有效 (非信任的密钥)"
 
@@ -7340,7 +7338,7 @@ msgstr "签名有效，但签名密钥已经被废止"
 msgid "BAD signature from \"%s\""
 msgstr "“%s”的签名错误"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "签名错误"
 
@@ -7832,58 +7830,68 @@ msgstr "已经过滤 %d 个邮件。"
 msgid "file %s already exists\n"
 msgstr "文件 %s 已经存在。\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "正在创建文本视图...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/打开(_O)"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "文件名"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件。\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "网页浏览器"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7895,7 +7903,7 @@ msgstr ""
 "显示的 URL (%s) 不同。\n"
 "仍然要打开吗？"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr ""
 
@@ -7983,6 +7991,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "无法将该邮件保存到发件箱。"
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "生成邮件标识号：%s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME类型"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6799d90c..a5313778 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: 2011-03-23 16:56+0900\n"
+"POT-Creation-Date: 2011-06-16 16:20+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: libsylph/account.c:57
+#: libsylph/account.c:55
 msgid "Reading all config for each account...\n"
 msgstr "讀取所有帳號的設定中...\n"
 
@@ -226,7 +226,7 @@ msgstr "imap 發生錯誤，命令為： CLOSE\n"
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4760
+#: libsylph/imap.c:4762
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -524,12 +524,12 @@ msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 msgid "can't open mark file\n"
 msgstr "無法開啟標示的檔案 \n"
 
-#: libsylph/procmsg.c:1334
+#: libsylph/procmsg.c:1407
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "無法擷取郵件 %d\n"
 
-#: libsylph/procmsg.c:1573
+#: libsylph/procmsg.c:1646
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：「%s」\n"
@@ -654,7 +654,7 @@ msgstr ""
 "您應該已經隨軟體收到一份 GPL；若沒有，請寫信到自由軟體基金會，地址是：\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3973
+#: src/account_dialog.c:137 src/mainwindow.c:3989
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -662,29 +662,29 @@ msgstr ""
 "您正在撰寫郵件，\n"
 "請關掉所有撰寫中的郵件再進行帳號設定。"
 
-#: src/account_dialog.c:145
+#: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
 msgstr "開啟帳號編輯視窗中...\n"
 
-#: src/account_dialog.c:193
+#: src/account_dialog.c:191
 #, fuzzy
 msgid "Creating folder tree. Please wait..."
 msgstr "產生資料夾檢視...\n"
 
-#: src/account_dialog.c:195
+#: src/account_dialog.c:193
 #, fuzzy
 msgid "Creation of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/account_dialog.c:295
+#: src/account_dialog.c:294
 msgid "Creating account edit window...\n"
 msgstr "產生帳號編輯視窗中...\n"
 
-#: src/account_dialog.c:300
+#: src/account_dialog.c:299
 msgid "Edit accounts"
 msgstr "編輯帳號設定"
 
-#: src/account_dialog.c:320
+#: src/account_dialog.c:319
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -692,40 +692,40 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:776
-#: src/compose.c:5329 src/editaddress.c:777 src/editaddress.c:826
+#: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:776
+#: src/compose.c:5348 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
-#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
+#: src/prefs_filter.c:258 src/prefs_folder_item.c:171 src/select-keys.c:311
 msgid "Name"
 msgstr "名稱"
 
-#: src/account_dialog.c:380 src/prefs_account_dialog.c:732
+#: src/account_dialog.c:379 src/prefs_account_dialog.c:732
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account_dialog.c:385
+#: src/account_dialog.c:384
 msgid "Server"
 msgstr "伺服器"
 
-#: src/account_dialog.c:409 src/prefs_filter.c:322
+#: src/account_dialog.c:408 src/prefs_filter.c:329
 msgid "Edit"
 msgstr "編輯"
 
-#: src/account_dialog.c:443
+#: src/account_dialog.c:448
 msgid " _Set as default account "
 msgstr "設為預設帳號(_S)"
 
-#: src/account_dialog.c:523
+#: src/account_dialog.c:528
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您確定要刪除帳號「%s」嗎？"
 
-#: src/account_dialog.c:525 src/prefs_filter.c:687
+#: src/account_dialog.c:530 src/prefs_filter.c:694
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account_dialog.c:526
+#: src/account_dialog.c:531
 msgid "Delete account"
 msgstr "刪除帳號"
 
@@ -828,7 +828,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:188 src/compose.c:3346 src/prefs_toolbar.c:89
+#: src/addressadd.c:188 src/compose.c:3347 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
@@ -847,8 +847,8 @@ msgstr "選擇通訊錄資料夾"
 msgid "Auto-registered address"
 msgstr "已紀錄之郵件樣板符號"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:550
-#: src/messageview.c:149
+#: src/addressbook.c:405 src/compose.c:579 src/mainwindow.c:550
+#: src/messageview.c:150
 msgid "/_File"
 msgstr "/檔案(_F)"
 
@@ -869,11 +869,11 @@ msgstr "/檔案(_F)/新增J-Pilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:568
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:584
+#: src/compose.c:589 src/compose.c:592 src/compose.c:595 src/mainwindow.c:568
 #: src/mainwindow.c:571 src/mainwindow.c:573 src/mainwindow.c:575
-#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:151
-#: src/messageview.c:156
+#: src/mainwindow.c:580 src/mainwindow.c:582 src/messageview.c:152
+#: src/messageview.c:157
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
@@ -889,21 +889,21 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:419 src/compose.c:596 src/messageview.c:158
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:586 src/messageview.c:159
+#: src/compose.c:598 src/mainwindow.c:586 src/messageview.c:160
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:587
-#: src/messageview.c:160
+#: src/addressbook.c:422 src/compose.c:603 src/mainwindow.c:587
+#: src/messageview.c:161
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:604
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
@@ -950,8 +950,8 @@ msgstr "/地址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:834
-#: src/messageview.c:282
+#: src/addressbook.c:440 src/compose.c:714 src/mainwindow.c:834
+#: src/messageview.c:283
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
@@ -964,13 +964,13 @@ msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:892
-#: src/messageview.c:302
+#: src/addressbook.c:444 src/compose.c:738 src/mainwindow.c:892
+#: src/messageview.c:303
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:912
-#: src/messageview.c:303
+#: src/addressbook.c:445 src/compose.c:739 src/mainwindow.c:912
+#: src/messageview.c:304
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
@@ -987,7 +987,7 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:570 src/compose.c:573
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1044,17 +1044,17 @@ msgstr "E-Mail 地址"
 msgid "Search:"
 msgstr "尋找"
 
-#: src/addressbook.c:904 src/compose.c:3291 src/headerview.c:55
+#: src/addressbook.c:904 src/compose.c:3292 src/headerview.c:55
 #: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:908 src/compose.c:3308 src/headerview.c:56
+#: src/addressbook.c:908 src/compose.c:3309 src/headerview.c:56
 #: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:912 src/compose.c:3325 src/prefs_folder_item.c:368
+#: src/addressbook.c:912 src/compose.c:3326 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件副本"
@@ -1261,7 +1261,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:855
+#: src/alertpanel.c:142 src/compose.c:6765 src/main.c:855
 msgid "Notice"
 msgstr "注意"
 
@@ -1317,408 +1317,408 @@ msgstr "棕色"
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:569 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/開啟(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:571
 msgid "/_Add..."
 msgstr "/新增(_A)..."
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:574 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/內容(_P)..."
 
-#: src/compose.c:579
+#: src/compose.c:580
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:582
 msgid "/_File/Send _later"
 msgstr "/檔案(_F)/稍後傳送(_L)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_File/Save to _draft folder"
 msgstr "/檔案(_F)/儲存至草稿資料夾(_D)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_File/Save and _keep editing"
 msgstr "/檔案(_F)/儲存並繼續編輯(_K)"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:591
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:593
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽章(_G)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/檔案(_F)/插入簽章(_G)"
 
-#: src/compose.c:598
+#: src/compose.c:599
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:600
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:590
-#: src/messageview.c:162
+#: src/compose.c:601 src/compose.c:608 src/mainwindow.c:590
+#: src/messageview.c:163
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:602
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_T)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
 
-#: src/compose.c:606 src/mainwindow.c:588 src/messageview.c:161
+#: src/compose.c:607 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_A)"
 
-#: src/compose.c:608
+#: src/compose.c:609
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折列(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:611
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的列折換(_L)"
 
-#: src/compose.c:612
+#: src/compose.c:613
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
-#: src/compose.c:613 src/mainwindow.c:596 src/messageview.c:166
+#: src/compose.c:614 src/mainwindow.c:596 src/messageview.c:167
 #: src/summaryview.c:476
 msgid "/_View"
 msgstr "/顯示(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:615
 msgid "/_View/_To"
 msgstr "/顯示(_V)/收件人(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:616
 msgid "/_View/_Cc"
 msgstr "/顯示(_V)/副本(_C)"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "/_View/_Bcc"
 msgstr "/顯示(_V)/密件副本(_S)"
 
-#: src/compose.c:617
+#: src/compose.c:618
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/顯示(_V)/回覆(_R)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:619 src/mainwindow.c:625
+#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/compose.c:625
+#: src/compose.c:628 src/mainwindow.c:619 src/mainwindow.c:625
 #: src/mainwindow.c:652 src/mainwindow.c:676 src/mainwindow.c:779
-#: src/mainwindow.c:783 src/messageview.c:258
+#: src/mainwindow.c:783 src/messageview.c:259
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:620
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/顯示(_V)/回應文章(_F)"
 
-#: src/compose.c:621
+#: src/compose.c:622
 msgid "/_View/R_uler"
 msgstr "/顯示(_V)/尺規(_U)"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/compose.c:633 src/mainwindow.c:683 src/messageview.c:173
+#: src/compose.c:634 src/mainwindow.c:683 src/messageview.c:174
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:679 src/mainwindow.c:686
-#: src/messageview.c:169
+#: src/compose.c:637 src/compose.c:643 src/compose.c:649 src/compose.c:653
+#: src/compose.c:661 src/compose.c:665 src/compose.c:671 src/compose.c:677
+#: src/compose.c:681 src/compose.c:691 src/compose.c:695 src/compose.c:703
+#: src/compose.c:707 src/mainwindow.c:679 src/mainwindow.c:686
+#: src/messageview.c:170
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:638 src/mainwindow.c:687 src/messageview.c:177
+#: src/compose.c:639 src/mainwindow.c:687 src/messageview.c:178
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:689 src/messageview.c:180
+#: src/compose.c:641 src/mainwindow.c:689 src/messageview.c:181
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字元編碼(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:693 src/messageview.c:183
+#: src/compose.c:645 src/mainwindow.c:693 src/messageview.c:184
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:695 src/messageview.c:185
+#: src/compose.c:647 src/mainwindow.c:695 src/messageview.c:186
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:701 src/messageview.c:190
+#: src/compose.c:651 src/mainwindow.c:701 src/messageview.c:191
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:705 src/messageview.c:193
+#: src/compose.c:655 src/mainwindow.c:705 src/messageview.c:194
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:656 src/mainwindow.c:707 src/messageview.c:195
+#: src/compose.c:657 src/mainwindow.c:707 src/messageview.c:196
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:709 src/messageview.c:197
+#: src/compose.c:659 src/mainwindow.c:709 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:713 src/messageview.c:200
+#: src/compose.c:663 src/mainwindow.c:713 src/messageview.c:201
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:717 src/messageview.c:203
+#: src/compose.c:667 src/mainwindow.c:717 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:719 src/messageview.c:205
+#: src/compose.c:669 src/mainwindow.c:719 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:723 src/messageview.c:208
+#: src/compose.c:673 src/mainwindow.c:723 src/messageview.c:209
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:725 src/messageview.c:210
+#: src/compose.c:675 src/mainwindow.c:725 src/messageview.c:211
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:729 src/messageview.c:213
+#: src/compose.c:679 src/mainwindow.c:729 src/messageview.c:214
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:733 src/messageview.c:216
+#: src/compose.c:683 src/mainwindow.c:733 src/messageview.c:217
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:735 src/messageview.c:218
+#: src/compose.c:685 src/mainwindow.c:735 src/messageview.c:219
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:737 src/messageview.c:220
+#: src/compose.c:687 src/mainwindow.c:737 src/messageview.c:221
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:739 src/messageview.c:222
+#: src/compose.c:689 src/mainwindow.c:739 src/messageview.c:223
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:743 src/messageview.c:225
+#: src/compose.c:693 src/mainwindow.c:743 src/messageview.c:226
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:753 src/messageview.c:234
+#: src/compose.c:697 src/mainwindow.c:753 src/messageview.c:235
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:755 src/messageview.c:236
+#: src/compose.c:699 src/mainwindow.c:755 src/messageview.c:237
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:757 src/messageview.c:238
+#: src/compose.c:701 src/mainwindow.c:757 src/messageview.c:239
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:765 src/messageview.c:245
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:246
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:771 src/messageview.c:250
+#: src/compose.c:709 src/mainwindow.c:771 src/messageview.c:251
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:773 src/messageview.c:252
+#: src/compose.c:711 src/mainwindow.c:773 src/messageview.c:253
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:835 src/messageview.c:283
+#: src/compose.c:715 src/mainwindow.c:835 src/messageview.c:284
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:859 src/messageview.c:299
+#: src/compose.c:718 src/mainwindow.c:859 src/messageview.c:300
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
+#: src/compose.c:720 src/compose.c:723 src/compose.c:727 src/compose.c:733
 #: src/mainwindow.c:838 src/mainwindow.c:852 src/mainwindow.c:857
 #: src/mainwindow.c:860 src/mainwindow.c:866 src/mainwindow.c:868
-#: src/messageview.c:286 src/messageview.c:298
+#: src/messageview.c:287 src/messageview.c:299
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:720
+#: src/compose.c:721
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_X)"
 
-#: src/compose.c:723
+#: src/compose.c:724
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_G)"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:734
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/執行(_X)"
 
-#: src/compose.c:734
+#: src/compose.c:735
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:1021
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1128 src/compose.c:1205
+#: src/compose.c:1129 src/compose.c:1206
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1751
+#: src/compose.c:1752
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1763
+#: src/compose.c:1764
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2273
+#: src/compose.c:2274
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2278
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2281 src/compose.c:4405
+#: src/compose.c:2282 src/compose.c:4416
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2285
+#: src/compose.c:2286
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2318
+#: src/compose.c:2319
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2378 src/mimeview.c:586
+#: src/compose.c:2379 src/mimeview.c:586
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2868 src/headerview.c:233 src/query_search.c:791
+#: src/compose.c:2869 src/headerview.c:233 src/query_search.c:791
 #: src/rpop3.c:675 src/summaryview.c:2494
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2871
+#: src/compose.c:2872
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2986
+#: src/compose.c:2987
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2994
+#: src/compose.c:2995
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2995
+#: src/compose.c:2996
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:3059
+#: src/compose.c:3060
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附加檔"
 
-#: src/compose.c:3060
+#: src/compose.c:3061
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3177 src/compose.c:3203
+#: src/compose.c:3178 src/compose.c:3204
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3223
+#: src/compose.c:3224
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/compose.c:3236 src/compose.c:5195 src/headerview.c:54
+#: src/compose.c:3237 src/compose.c:5214 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3258 src/headerview.c:58 src/prefs_template.c:205
+#: src/compose.c:3259 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "主旨："
 
-#: src/compose.c:3351
+#: src/compose.c:3352
 #, fuzzy
 msgid "_Send"
 msgstr "送出"
 
-#: src/compose.c:3489
+#: src/compose.c:3491
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3509
+#: src/compose.c:3519
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1726,40 +1726,42 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3523 src/send_message.c:353
+#: src/compose.c:3533 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3573
-msgid "Can't save the message to outbox."
-msgstr "無法將郵件送至寄件夾中。"
+#: src/compose.c:3583
+msgid ""
+"Sending of message was completed, but the message could not be saved to "
+"outbox."
+msgstr ""
 
-#: src/compose.c:3616
+#: src/compose.c:3627
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3643 src/compose.c:4028
+#: src/compose.c:3654 src/compose.c:4039
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3670 src/compose.c:4071
+#: src/compose.c:3681 src/compose.c:4082
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3705 src/compose.c:4066
+#: src/compose.c:3716 src/compose.c:4077
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3751 src/compose.c:4099 src/compose.c:4162 src/compose.c:4282
+#: src/compose.c:3762 src/compose.c:4110 src/compose.c:4173 src/compose.c:4293
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3784
+#: src/compose.c:3795
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1769,11 +1771,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3790
+#: src/compose.c:3801
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3876
+#: src/compose.c:3887
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1786,15 +1788,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3880
+#: src/compose.c:3891
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:4046
+#: src/compose.c:4057
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4047
+#: src/compose.c:4058
 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 "
@@ -1803,101 +1805,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4242
+#: src/compose.c:4253
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:4260
+#: src/compose.c:4271
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:4348
+#: src/compose.c:4359
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:4355
+#: src/compose.c:4366
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4400
+#: src/compose.c:4411
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:4409
+#: src/compose.c:4420
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:5029
-#, c-format
-msgid "generated Message-ID: %s\n"
-msgstr "產生郵件的編號：%s\n"
-
-#: src/compose.c:5144
+#: src/compose.c:5163
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:5269
+#: src/compose.c:5288
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:5272
+#: src/compose.c:5291
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5310 src/mimeview.c:209
+#: src/compose.c:5329 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "日期"
 
 #. S_COL_DATE
-#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:508
+#: src/compose.c:5338 src/mimeview.c:217 src/prefs_filter_edit.c:508
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
 #: src/summaryview.c:5403
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6408
+#: src/compose.c:6427
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6426
+#: src/compose.c:6445
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6495
+#: src/compose.c:6514
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:6513
+#: src/compose.c:6532
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. Encoding
-#: src/compose.c:6515 src/prefs_common_dialog.c:1036
+#: src/compose.c:6534 src/prefs_common_dialog.c:1036
 #: src/prefs_common_dialog.c:1698
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6538 src/prefs_folder_item.c:202
+#: src/compose.c:6557 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6539
+#: src/compose.c:6558
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6628
+#: src/compose.c:6647
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:6638 src/mimeview.c:1220 src/mimeview.c:1235
+#: src/compose.c:6657 src/mimeview.c:1305 src/mimeview.c:1320
 msgid "Opening executable file"
 msgstr "正在開啟可執行的檔案"
 
-#: src/compose.c:6639 src/mimeview.c:1221 src/mimeview.c:1236
+#: src/compose.c:6658 src/mimeview.c:1306 src/mimeview.c:1321
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1908,12 +1905,12 @@ msgstr ""
 "如果您要執行它，請將它存於其他地方並且確定它並非是病毒或者某種心懷不軌的程"
 "式。"
 
-#: src/compose.c:6681
+#: src/compose.c:6700
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6743
+#: src/compose.c:6762
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1923,48 +1920,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:7080 src/mainwindow.c:3059
+#: src/compose.c:7099 src/mainwindow.c:3059
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7219 src/compose.c:7224 src/compose.c:7230
+#: src/compose.c:7239 src/compose.c:7244 src/compose.c:7263
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:7329
+#: src/compose.c:7363
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:7352 src/inputdialog.c:372
+#: src/compose.c:7386 src/inputdialog.c:372
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:7406
+#: src/compose.c:7440
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:7407
+#: src/compose.c:7441
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:7409 src/compose.c:7413
+#: src/compose.c:7443 src/compose.c:7447
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:7460
+#: src/compose.c:7494
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:7462
+#: src/compose.c:7496
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7463
+#: src/compose.c:7497
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2479,12 +2476,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:911 src/mainwindow.c:4176 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4192 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4181 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4197 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -3348,16 +3345,16 @@ msgstr "/檔案(_F)/匯出資料夾(_E)"
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空刪除的郵件(_T)"
 
-#: src/mainwindow.c:574 src/messageview.c:150
+#: src/mainwindow.c:574 src/messageview.c:151
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:577 src/messageview.c:153
+#: src/mainwindow.c:577 src/messageview.c:154
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:579 src/messageview.c:155
+#: src/mainwindow.c:579 src/messageview.c:156
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印(_P)..."
 
@@ -3374,7 +3371,7 @@ msgstr "/檔案(_F)/離開(_X)"
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取串列(_T)"
 
-#: src/mainwindow.c:591 src/messageview.c:163
+#: src/mainwindow.c:591 src/messageview.c:164
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前郵件中尋找(_F)"
 
@@ -3597,36 +3594,36 @@ msgstr "/顯示(_V)/前往(_G)/下一封已標記顏色之郵件(_B)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:684 src/messageview.c:174
+#: src/mainwindow.c:684 src/messageview.c:175
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字元編碼(_E)/自動偵測(_A)"
 
-#: src/mainwindow.c:697 src/messageview.c:187
+#: src/mainwindow.c:697 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/mainwindow.c:745 src/messageview.c:227
+#: src/mainwindow.c:745 src/messageview.c:228
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:747 src/messageview.c:229
+#: src/mainwindow.c:747 src/messageview.c:230
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:749 src/messageview.c:231
+#: src/mainwindow.c:749 src/messageview.c:232
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:759 src/messageview.c:240
+#: src/mainwindow.c:759 src/messageview.c:241
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (EUC-_TW)"
 
-#: src/mainwindow.c:761 src/messageview.c:242
+#: src/mainwindow.c:761 src/messageview.c:243
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:767 src/messageview.c:247
+#: src/mainwindow.c:767 src/messageview.c:248
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
@@ -3634,11 +3631,11 @@ msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
-#: src/mainwindow.c:781 src/messageview.c:259 src/summaryview.c:479
+#: src/mainwindow.c:781 src/messageview.c:260 src/summaryview.c:479
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_A)"
 
-#: src/mainwindow.c:782 src/messageview.c:260 src/summaryview.c:480
+#: src/mainwindow.c:782 src/messageview.c:261 src/summaryview.c:480
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
@@ -3647,7 +3644,7 @@ msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/mainwindow.c:786 src/messageview.c:263
+#: src/mainwindow.c:786 src/messageview.c:264
 msgid "/_Message"
 msgstr "/郵件(_M)"
 
@@ -3683,16 +3680,16 @@ msgstr "/郵件(_M)/將暫存資料夾中的郵件送出(_S)"
 
 #: src/mainwindow.c:798 src/mainwindow.c:800 src/mainwindow.c:807
 #: src/mainwindow.c:812 src/mainwindow.c:815 src/mainwindow.c:826
-#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:266
-#: src/messageview.c:274 src/messageview.c:279
+#: src/mainwindow.c:828 src/mainwindow.c:831 src/messageview.c:267
+#: src/messageview.c:275 src/messageview.c:280
 msgid "/_Message/---"
 msgstr "/郵件(_M)/---"
 
-#: src/mainwindow.c:799 src/messageview.c:264
+#: src/mainwindow.c:799 src/messageview.c:265
 msgid "/_Message/Compose _new message"
 msgstr "/郵件(_M)/撰寫郵件(_N)"
 
-#: src/mainwindow.c:801 src/messageview.c:267
+#: src/mainwindow.c:801 src/messageview.c:268
 msgid "/_Message/_Reply"
 msgstr "/郵件(_M)/直接回覆(_R)"
 
@@ -3700,27 +3697,27 @@ msgstr "/郵件(_M)/直接回覆(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/郵件(_M)/回覆給(_Y)"
 
-#: src/mainwindow.c:803 src/messageview.c:268
+#: src/mainwindow.c:803 src/messageview.c:269
 msgid "/_Message/Repl_y to/_all"
 msgstr "/郵件(_M)/回覆給(_Y)/所有收件人(_A)"
 
-#: src/mainwindow.c:804 src/messageview.c:270
+#: src/mainwindow.c:804 src/messageview.c:271
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/郵件(_M)/回覆給(_Y)/原作者(_S)"
 
-#: src/mainwindow.c:805 src/messageview.c:272
+#: src/mainwindow.c:805 src/messageview.c:273
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/郵件(_M)/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/mainwindow.c:808 src/messageview.c:275
+#: src/mainwindow.c:808 src/messageview.c:276
 msgid "/_Message/_Forward"
 msgstr "/郵件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:809 src/messageview.c:276
+#: src/mainwindow.c:809 src/messageview.c:277
 msgid "/_Message/For_ward as attachment"
 msgstr "/郵件(_M)/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:811 src/messageview.c:278
+#: src/mainwindow.c:811 src/messageview.c:279
 msgid "/_Message/Redirec_t"
 msgstr "/郵件(_M)/郵件導向(_T)"
 
@@ -3779,7 +3776,7 @@ msgstr "/郵件(_M)/歸類為垃圾郵件(_J)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/郵件(_M)/歸類為非垃圾郵件(_U)"
 
-#: src/mainwindow.c:832 src/messageview.c:280
+#: src/mainwindow.c:832 src/messageview.c:281
 msgid "/_Message/Re-_edit"
 msgstr "/郵件(_M)/重新編輯(_E)"
 
@@ -3795,23 +3792,23 @@ msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件(_F)"
 
-#: src/mainwindow.c:843 src/messageview.c:287
+#: src/mainwindow.c:843 src/messageview.c:288
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)"
 
-#: src/mainwindow.c:844 src/messageview.c:289
+#: src/mainwindow.c:844 src/messageview.c:290
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:846 src/messageview.c:291
+#: src/mainwindow.c:846 src/messageview.c:292
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:848 src/messageview.c:293
+#: src/mainwindow.c:848 src/messageview.c:294
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:850 src/messageview.c:295
+#: src/mainwindow.c:850 src/messageview.c:296
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依主旨(_S)"
 
@@ -4069,42 +4066,42 @@ msgstr "文字"
 msgid "_None"
 msgstr "無"
 
-#: src/mainwindow.c:3087
+#: src/mainwindow.c:3095
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:3099
+#: src/mainwindow.c:3107
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:3373
+#: src/mainwindow.c:3389
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
-#: src/mainwindow.c:3776
+#: src/mainwindow.c:3792
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3886
+#: src/mainwindow.c:3902
 #, fuzzy
 msgid "Select folder to open"
 msgstr "選擇資料夾"
 
-#: src/mainwindow.c:4056
+#: src/mainwindow.c:4072
 #, fuzzy
 msgid "Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:4069
+#: src/mainwindow.c:4085
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [選項]...\n"
 
-#: src/mainwindow.c:4077
+#: src/mainwindow.c:4093
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4121,7 +4118,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4110
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4138,15 +4135,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4112
+#: src/mainwindow.c:4128
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4120
+#: src/mainwindow.c:4136
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4125
+#: src/mainwindow.c:4141
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4183,27 +4180,27 @@ msgstr "搜尋已到尾端。要從頂端繼續搜尋嗎？"
 msgid "Search finished"
 msgstr "搜尋結束"
 
-#: src/messageview.c:284
+#: src/messageview.c:285
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)"
 
-#: src/messageview.c:316
+#: src/messageview.c:317
 msgid "Creating message view...\n"
 msgstr "產生郵件視窗...\n"
 
-#: src/messageview.c:341
+#: src/messageview.c:342
 msgid "Text"
 msgstr "文字"
 
-#: src/messageview.c:346
+#: src/messageview.c:347
 msgid "Attachments"
 msgstr "附加檔"
 
-#: src/messageview.c:397
+#: src/messageview.c:398
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3866
+#: src/messageview.c:769 src/summaryview.c:3866
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
@@ -4264,7 +4261,7 @@ msgstr "請選擇「檢查數位簽章」來檢查"
 msgid "Select an action for the attached file:\n"
 msgstr "為附加檔案選取一個動作:\n"
 
-#: src/mimeview.c:666
+#: src/mimeview.c:666 src/textview.c:813
 msgid "Open _with..."
 msgstr "用別的程式開啟(_W)..."
 
@@ -4272,7 +4269,7 @@ msgstr "用別的程式開啟(_W)..."
 msgid "_Display as text"
 msgstr "以純文字顯示(_D)"
 
-#: src/mimeview.c:674
+#: src/mimeview.c:674 src/textview.c:816
 msgid "_Save as..."
 msgstr "另存新檔(_S)..."
 
@@ -4289,7 +4286,8 @@ msgid "_Check signature"
 msgstr "檢查數位簽章(_C)"
 
 #: src/mimeview.c:1019 src/mimeview.c:1086 src/mimeview.c:1122
-#: src/mimeview.c:1155 src/mimeview.c:1178 src/mimeview.c:1301
+#: src/mimeview.c:1152 src/mimeview.c:1172 src/mimeview.c:1220
+#: src/mimeview.c:1240 src/mimeview.c:1263 src/mimeview.c:1386
 msgid "Can't save the part of multipart message."
 msgstr "無法儲存部份的多重郵件。"
 
@@ -4297,11 +4295,11 @@ msgstr "無法儲存部份的多重郵件。"
 msgid "Can't save the attachments."
 msgstr "無法儲存附加檔案。"
 
-#: src/mimeview.c:1188
+#: src/mimeview.c:1182 src/mimeview.c:1273
 msgid "Open with"
 msgstr "以別的程式開啟"
 
-#: src/mimeview.c:1189
+#: src/mimeview.c:1183 src/mimeview.c:1274
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -6064,21 +6062,21 @@ msgstr "指定顯示項目"
 msgid " Revert to default "
 msgstr "還原預設值"
 
-#: src/prefs_filter.c:208
+#: src/prefs_filter.c:209
 #, fuzzy
 msgid "Filter settings"
 msgstr "郵件過濾設定"
 
-#: src/prefs_filter.c:252
+#: src/prefs_filter.c:253
 msgid "Enabled"
 msgstr "已開啟"
 
-#: src/prefs_filter.c:686
+#: src/prefs_filter.c:693
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "您確定要刪除這項規則「%s」嗎？"
 
-#: src/prefs_filter.c:688
+#: src/prefs_filter.c:695
 msgid "Delete rule"
 msgstr "刪除規則"
 
@@ -7263,7 +7261,7 @@ msgstr "未發現簽章"
 msgid "Good signature from \"%s\""
 msgstr "來自\"%s\" 的簽章檢查正確"
 
-#: src/sigstatus.c:244 src/textview.c:780
+#: src/sigstatus.c:244 src/textview.c:1036
 msgid "Good signature"
 msgstr "簽章檢查正確"
 
@@ -7272,7 +7270,7 @@ msgstr "簽章檢查正確"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰不可信。"
 
-#: src/sigstatus.c:249 src/textview.c:782
+#: src/sigstatus.c:249 src/textview.c:1038
 msgid "Valid signature (untrusted key)"
 msgstr "簽章有效 (不可信的金鑰)"
 
@@ -7308,7 +7306,7 @@ msgstr "此簽章是有效的，不過 \"%s\" 的金鑰已撤消"
 msgid "BAD signature from \"%s\""
 msgstr "來自 \"%s\" 的簽章檢查錯誤"
 
-#: src/sigstatus.c:267 src/textview.c:784
+#: src/sigstatus.c:267 src/textview.c:1040
 msgid "BAD signature"
 msgstr "簽章檢查錯誤"
 
@@ -7797,54 +7795,64 @@ msgstr "已過濾 %d 封郵件"
 msgid "file %s already exists\n"
 msgstr "檔案 %s 已存在。\n"
 
-#: src/textview.c:253
+#: src/textview.c:260
 msgid "Creating text view...\n"
 msgstr "產生文字視窗...\n"
 
-#: src/textview.c:502
+#: src/textview.c:511
 msgid "This message is encrypted, but its decryption failed.\n"
 msgstr ""
 
-#: src/textview.c:836
+#: src/textview.c:810
+#, fuzzy
+msgid "_Open"
+msgstr "/開啟(_O)"
+
+#: src/textview.c:820
+#, fuzzy
+msgid "_Copy file name"
+msgstr "檔名"
+
+#: src/textview.c:1092
 msgid "This message can't be displayed.\n"
 msgstr "無法顯示郵件。\n"
 
-#: src/textview.c:860
+#: src/textview.c:1116
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:2013
+#: src/textview.c:2335
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:2033 src/trayicon.c:158
+#: src/textview.c:2355 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
-#: src/textview.c:2035
+#: src/textview.c:2357
 #, fuzzy
 msgid "R_eply to this address"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:2038
+#: src/textview.c:2360
 msgid "Add to address _book..."
 msgstr "將寄信人加入通訊錄(_B)..."
 
-#: src/textview.c:2040
+#: src/textview.c:2362
 msgid "Copy this add_ress"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:2043
+#: src/textview.c:2365
 msgid "_Open with Web browser"
 msgstr "以瀏覽器開啟(_O)"
 
-#: src/textview.c:2045
+#: src/textview.c:2367
 msgid "Copy this _link"
 msgstr "複製此連接(_L)"
 
-#: src/textview.c:2249
+#: src/textview.c:2571
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7856,7 +7864,7 @@ msgstr ""
 "\n"
 "確定要開啟嗎？"
 
-#: src/textview.c:2254
+#: src/textview.c:2576
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"
 
@@ -7943,6 +7951,12 @@ msgstr ""
 msgid "Do you really remove attached files from the selected messages?"
 msgstr ""
 
+#~ msgid "Can't save the message to outbox."
+#~ msgstr "無法將郵件送至寄件夾中。"
+
+#~ msgid "generated Message-ID: %s\n"
+#~ msgstr "產生郵件的編號：%s\n"
+
 #~ msgid "MIME Type"
 #~ msgstr "MIME 型態"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2011-06-16 07:32:14 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2011-06-16 07:32:14 +0000
commit	d0c1d8fe3712b35b1a0192496e8fc306961221b6 (patch)
tree	4869e82869478115907c37f60e864c6c1f4d7d69
parent	9c294319c3b50fc48e0d8990bdfc9c897e67aee4 (diff)