updated po files.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1883 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2007-08-23 10:26:55 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2007-08-23 10:26:55 +0000
commit: 59265e30628b9ecef897d8c9d3a9b9d8b72a4d82 (patch)
tree: e2627d8dc24701f8979e87b24789a7ab902ba697 /po
parent: d317bb77282ba4e6b1e5e94924827d1b2c60f69a (diff)
31 files changed, 2010 insertions, 2105 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index f7b56359..5e1817a8 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-23
+
+	* updated ru.po and be.po.
+
+2007-07-20
+
+	* updated pt_BR.po.
+
 2007-07-12
 
 	* updated es.po.
diff --git a/po/be.po b/po/be.po
index 6572335d..3500778f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,11 +2,11 @@
 # Mikalai Udodau <crom dash a at tut dot by>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: sylpheed 2.4.0 \n"
+"Project-Id-Version: sylpheed 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
-"PO-Revision-Date: 2007-02-27 22:43+0200\n"
-"Last-Translator: Mikalai Udodau <crom dash a at tut dot by>\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
+"PO-Revision-Date: 2007-07-31 21:33+0300\n"
+"Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,7 +14,7 @@ msgstr ""
 
 #: libsylph/account.c:56
 msgid "Reading all config for each account...\n"
-msgstr "Чытаю ўсе наладкі для кожнага акаунта...\n"
+msgstr "Чытаю ўсе канфігурацыі для кожнага акаунта...\n"
 
 #: libsylph/imap.c:469
 #, c-format
@@ -66,7 +66,7 @@ msgstr "нельга ўстанавіць флагі выдалення: %s\n"
 
 #: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
-msgstr "нельга выкрасліць\n"
+msgstr "нельга выкрэсліць\n"
 
 #: libsylph/imap.c:1609
 #, c-format
@@ -304,9 +304,9 @@ msgid "the src folder is identical to the dest.\n"
 msgstr "выточны каталог ідэнтычны з прызначэннем.\n"
 
 #: libsylph/mh.c:672
-#, fuzzy, c-format
+#, c-format
 msgid "Copying message %s/%d to %s ...\n"
-msgstr "Капірую паведамленне %s%c%d у %s ...\n"
+msgstr "Капірую паведамленне %s/%d у %s ...\n"
 
 #: libsylph/mh.c:1002 libsylph/mh.c:1015 src/main.c:158
 #, c-format
@@ -441,9 +441,8 @@ msgid "Timestamp syntax error in greeting\n"
 msgstr "Памылка сінтаксісу азнакі часу ў прывітанні\n"
 
 #: libsylph/pop.c:170
-#, fuzzy
 msgid "Invalid timestamp in greeting\n"
-msgstr "Патрабуемая APOP азнака часу не знойдзена ў прывітанні\n"
+msgstr "Неправільная азнака часу ў прывітанні\n"
 
 #: libsylph/pop.c:198 libsylph/pop.c:225
 msgid "POP3 protocol error\n"
@@ -501,7 +500,7 @@ msgstr "Знайдзена: %s\n"
 
 #: libsylph/prefs.c:272
 msgid "Configuration is saved.\n"
-msgstr "Канфігурацыя захавана.\n"
+msgstr "Канфігурацыя запісана.\n"
 
 #: libsylph/prefs_common.c:512
 msgid "Junk mail filter (manual)"
@@ -622,10 +621,10 @@ msgid ""
 "version.\n"
 "\n"
 msgstr ""
-"Гэта праграма з'яўляецца свабодным праграмным забеспячэннем; Вы можаце "
-"распаўсюджваць і/альбо змяняць яе згодна з умовамі Агульнай Грамадскай "
-"Ліцэнзіі GNU, выдадзенай Фондам Вольных Праграм (FSF); як версіі 2, так і "
-"(на ваш выбар) любой пазнейшай версіі.\n"
+"Гэтая праграма - свабоднае праграмнае забеспячэнне; Вы можаце распаўсюджваць "
+"і/альбо змяняць яе згодна з умовамі Агульнай Грамадскай Ліцэнзіі GNU, "
+"выдадзенай Фондам Вольных Праграм (FSF); як версіі 2, так і (на ваш выбар) "
+"любой пазнейшай версіі.\n"
 "\n"
 
 #: src/about.c:236
@@ -636,10 +635,9 @@ msgid ""
 "more details.\n"
 "\n"
 msgstr ""
-"Гэта праграма распаўсюджваецца з надзеяй, што яна будзе карыснай, але БЕЗ "
-"АНІЯКІХ ГАРАНТЫЙ, у тым ліку і без гарантый ТАВАРНАГА СТАНУ ці ПРЫДАТНАСЦІ "
-"ДА ПЭЎНАЙ МЭТЫ. Гл. Агульную Грамадскую Ліцэнзію GNU (GNU GPL) за "
-"дэталямі. \n"
+"Праграма распаўсюджваецца з надзеяй, што яна будзе карыснай, але БЕЗ АНІЯКІХ "
+"ГАРАНТЫЙ, у тым ліку і без гарантый ТАВАРНАГА СТАНУ ці ПРЫДАТНАСЦІ ДА ПЭЎНАЙ "
+"МЭТЫ. Гл. Агульную Грамадскую Ліцэнзію GNU (GNU GPL) за дэталямі. \n"
 "\n"
 
 #: src/about.c:242
@@ -681,7 +679,7 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -745,7 +743,7 @@ msgid ""
 "Command could not be started. Pipe creation failed.\n"
 "%s"
 msgstr ""
-"Загад не можа быць запушчаны. Памылка стварэння канала.\n"
+"Загад не можа быць выкананы. Стварэнне каналу схібіла.\n"
 "%s"
 
 #. Fork error
@@ -832,23 +830,23 @@ msgstr "Выберыце каталог Адраснай кнігі"
 #: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:520
 #: src/messageview.c:149
 msgid "/_File"
-msgstr "/_Файл"
+msgstr "/Ф_айл"
 
 #: src/addressbook.c:352
 msgid "/_File/New _Book"
-msgstr "/_Файл/Новая Кніга"
+msgstr "/Ф_айл/Новая Кн_іга"
 
 #: src/addressbook.c:353
 msgid "/_File/New _vCard"
-msgstr "/_Файл/Новы _vCard"
+msgstr "/Ф_айл/Новы _vCard"
 
 #: src/addressbook.c:355
 msgid "/_File/New _JPilot"
-msgstr "/_Файл/Новы _J-Pilot"
+msgstr "/Ф_айл/Новы _J-Pilot"
 
 #: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
-msgstr "/_Файл/Новы сервер _LDAP"
+msgstr "/Ф_айл/Новы сервер _LDAP"
 
 #: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
 #: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:538
@@ -856,23 +854,23 @@ msgstr "/_Файл/Новы сервер _LDAP"
 #: src/mainwindow.c:550 src/mainwindow.c:552 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
-msgstr "/_Файл/---"
+msgstr "/Ф_айл/---"
 
 #: src/addressbook.c:361
 msgid "/_File/_Edit"
-msgstr "/_Файл/_Рэдагаваць"
+msgstr "/Ф_айл/_Рэдагаваць"
 
 #: src/addressbook.c:362
 msgid "/_File/_Delete"
-msgstr "/_Файл/_Выдаліць"
+msgstr "/Ф_айл/_Выдаліць"
 
 #: src/addressbook.c:364
 msgid "/_File/_Save"
-msgstr "/_Файл/Захаваць"
+msgstr "/Ф_айл/Запісаць"
 
 #: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
 msgid "/_File/_Close"
-msgstr "/_Файл/_Закрыць"
+msgstr "/Ф_айл/Закрыць"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:567 src/mainwindow.c:556 src/messageview.c:159
@@ -882,11 +880,11 @@ msgstr "/_Рэдагаваць"
 #: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:557
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
-msgstr "/_Рэдагаваць/_Капіраваць"
+msgstr "/_Рэдагаваць/Капіраваць"
 
 #: src/addressbook.c:369 src/compose.c:573
 msgid "/_Edit/_Paste"
-msgstr "/_Рэдагаваць/_Ўставіць"
+msgstr "/_Рэдагаваць/Ўставіць"
 
 #: src/addressbook.c:371
 msgid "/_Address"
@@ -898,11 +896,11 @@ msgstr "/_Адрас/Новы Адрас"
 
 #: src/addressbook.c:373
 msgid "/_Address/New _Group"
-msgstr "/_Адрас/Новая Група"
+msgstr "/_Адрас/Новая Гру_па"
 
 #: src/addressbook.c:374
 msgid "/_Address/New _Folder"
-msgstr "/_Адрас/Новы Каталог"
+msgstr "/_Адрас/Новы К_аталог"
 
 #: src/addressbook.c:375
 msgid "/_Address/---"
@@ -914,7 +912,7 @@ msgstr "/_Адрас/Рэдагаваць"
 
 #: src/addressbook.c:377
 msgid "/_Address/_Delete"
-msgstr "/_Адрас/Выдаліць"
+msgstr "/_Адрас/_Выдаліць"
 
 #: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:798
 #: src/messageview.c:282
@@ -926,9 +924,8 @@ msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
 #: src/addressbook.c:381
-#, fuzzy
 msgid "/_Tools/Import _CSV file"
-msgstr "/_Прылады/Імпартаваць файл _LDIF"
+msgstr "/_Прылады/Імпартаваць файл _CSV"
 
 #: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:852
 #: src/messageview.c:302
@@ -946,11 +943,11 @@ msgstr "/Новы адрас"
 
 #: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
-msgstr "/Новая група"
+msgstr "/Новая гру_па"
 
 #: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
-msgstr "/Новы каталог"
+msgstr "/Новы к_аталог"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
@@ -1024,9 +1021,8 @@ msgid "Lookup"
 msgstr "Пошук"
 
 #: src/addressbook.c:712
-#, fuzzy
 msgid "_Close"
-msgstr "Колеры"
+msgstr "Закрыць"
 
 #. Confirm deletion
 #: src/addressbook.c:882
@@ -1052,11 +1048,11 @@ msgstr "Выдаліць каталог"
 
 #: src/addressbook.c:1666
 msgid "_Folder only"
-msgstr "Толькі _Каталог"
+msgstr "Толькі К_аталог"
 
 #: src/addressbook.c:1666
 msgid "Folder and _addresses"
-msgstr "Каталог і _адрас(ы)"
+msgstr "Каталог і адрас(ы)"
 
 #: src/addressbook.c:1671
 #, c-format
@@ -1065,11 +1061,11 @@ msgstr "Сапраўды выдаліць `%s' ?"
 
 #: src/addressbook.c:2450 src/addressbook.c:2583
 msgid "New user, could not save index file."
-msgstr "Новы карыстальнік, немагчыма захаваць індэксны файл."
+msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
 #: src/addressbook.c:2454 src/addressbook.c:2587
 msgid "New user, could not save address book files."
-msgstr "Новы карыстальнік, немагчыма захаваць файлы адраснай кнігі."
+msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
 #: src/addressbook.c:2464 src/addressbook.c:2597
 msgid "Old address book converted successfully."
@@ -1081,7 +1077,7 @@ msgid ""
 "could not save new address index file"
 msgstr ""
 "Старая адрасная кніга сканвертавана,\n"
-"немагчыма захаваць новы індэксны файл адрасоў."
+"немагчыма запісаць новы індэксны файл адрасоў."
 
 #: src/addressbook.c:2482
 msgid ""
@@ -1108,17 +1104,14 @@ msgstr ""
 "і нельга стварыць файлы новай адраснай кнігі."
 
 #: src/addressbook.c:2500
-#, fuzzy
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
 #: src/addressbook.c:2504
-#, fuzzy
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
 #: src/addressbook.c:2539
-#, fuzzy
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
@@ -1129,7 +1122,7 @@ msgstr "Немагчыма прачытаць індэкс адрасу"
 #: src/addressbook.c:2602
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
-"Старая адрасная кніга сканвертавана, але нельга захаваць новы файл індэксу "
+"Старая адрасная кніга сканвертавана, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
 #: src/addressbook.c:2616
@@ -1152,14 +1145,12 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
 #: src/addressbook.c:2646
-#, fuzzy
 msgid "Address Book Conversion Error"
-msgstr "Памылка Канверсіі Адраснай Кнігі"
+msgstr "Памылка канверсіі Адраснай кнігі"
 
 #: src/addressbook.c:2652
-#, fuzzy
 msgid "Address Book Conversion"
-msgstr "Канверсія Адраснай Кнігі"
+msgstr "Канверсія Адраснай кнігі"
 
 #: src/addressbook.c:3172 src/prefs_common_dialog.c:2103
 msgid "Interface"
@@ -1207,9 +1198,9 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабісты адрас"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
-msgstr "Нататак"
+msgstr "Заўвага"
 
 #: src/alertpanel.c:155 src/main.c:854
 msgid "Warning"
@@ -1225,7 +1216,7 @@ msgstr "Ствараю дыялог папярэджання...\n"
 
 #: src/alertpanel.c:318
 msgid "Show this message next time"
-msgstr "Паказваць гэта паведамленне ў наступны раз"
+msgstr "Паказваць гэтае паведамленне ў наступны раз"
 
 #: src/colorlabel.c:46
 msgid "Orange"
@@ -1277,43 +1268,43 @@ msgstr "/_Уласцівасці..."
 
 #: src/compose.c:549
 msgid "/_File/_Send"
-msgstr "/_Файл/Выслаць"
+msgstr "/Ф_айл/В_ыслаць"
 
 #: src/compose.c:551
 msgid "/_File/Send _later"
-msgstr "/_Файл/Выслаць пазней"
+msgstr "/Ф_айл/Выслаць пазней"
 
 #: src/compose.c:554
 msgid "/_File/Save to _draft folder"
-msgstr "/_Файл/Захаваць у каталогу чарнавікоў"
+msgstr "/Ф_айл/Запісаць у каталог чарна_вікоў"
 
 #: src/compose.c:556
 msgid "/_File/Save and _keep editing"
-msgstr "/_Файл/Запісаць і працягваць рэдагаваць"
+msgstr "/Ф_айл/Запісаць і рэдагаваць да_лей"
 
 #: src/compose.c:559
 msgid "/_File/_Attach file"
-msgstr "/_Файл/_Укласці файл"
+msgstr "/Ф_айл/Далучыць _файл"
 
 #: src/compose.c:560
 msgid "/_File/_Insert file"
-msgstr "/_Файл/Ўставіць файл"
+msgstr "/Ф_айл/Ўставіць файл"
 
 #: src/compose.c:562
 msgid "/_File/Insert si_gnature"
-msgstr "/_Файл/Ўставіць подпіс"
+msgstr "/Ф_айл/Ўставіць _подпіс"
 
 #: src/compose.c:563
 msgid "/_File/A_ppend signature"
-msgstr "/_Файл/Далучыць подпіс"
+msgstr "/Ф_айл/Далучыць подпіс"
 
 #: src/compose.c:568
 msgid "/_Edit/_Undo"
-msgstr "/_Рэдагаваць/_Адкаціць"
+msgstr "/_Рэдагаваць/Адкаціць"
 
 #: src/compose.c:569
 msgid "/_Edit/_Redo"
-msgstr "/_Рэдагаваць/Наноў"
+msgstr "/_Рэдагаваць/Паўтарыць"
 
 #: src/compose.c:570 src/compose.c:577 src/mainwindow.c:560
 #: src/messageview.c:162
@@ -1334,69 +1325,67 @@ msgstr "/_Рэдагаваць/Вылучыць усё"
 
 #: src/compose.c:578
 msgid "/_Edit/_Wrap current paragraph"
-msgstr "/_Рэдагаваць/Завярнуць бягучы параграф"
+msgstr "/_Рэдагаваць/Завярну_ць бягучы параграф"
 
 #: src/compose.c:580
 msgid "/_Edit/Wrap all long _lines"
-msgstr "/_Рэдагаваць/Перанесці усе доўгія радкі"
+msgstr "/_Рэдагаваць/Перанесці усе _доўгія радкі"
 
 #: src/compose.c:582
 msgid "/_Edit/Aut_o wrapping"
-msgstr "/_Рэдагаваць/Аўтаперанос"
+msgstr "/_Рэдагаваць/А_ўтаперанос"
 
 #: src/compose.c:583 src/mainwindow.c:565 src/messageview.c:166
 #: src/summaryview.c:502
 msgid "/_View"
-msgstr "/_Выгляд"
+msgstr "/Выгляд"
 
 #: src/compose.c:584
 msgid "/_View/_To"
-msgstr "/_Выгляд/_Да"
+msgstr "/Выгляд/_Да"
 
 #: src/compose.c:585
 msgid "/_View/_Cc"
-msgstr "/_Выгляд/_Копія"
+msgstr "/Выгляд/_Копія"
 
 #: src/compose.c:586
 msgid "/_View/_Bcc"
-msgstr "/_Выгляд/_Bcc"
+msgstr "/Выгляд/_Bcc"
 
 #: src/compose.c:587
-#, fuzzy
 msgid "/_View/_Reply-To"
-msgstr "/_Выгляд/_Адказаць да"
+msgstr "/Выгляд/Ад_казваць"
 
 #: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
 #: src/compose.c:597 src/mainwindow.c:588 src/mainwindow.c:591
 #: src/mainwindow.c:618 src/mainwindow.c:642 src/mainwindow.c:745
 #: src/mainwindow.c:749 src/messageview.c:258
 msgid "/_View/---"
-msgstr "/_Выгляд/---"
+msgstr "/Выгляд/---"
 
 #: src/compose.c:589
-#, fuzzy
 msgid "/_View/_Followup-To"
-msgstr "/_Выгляд/_Узыходзіць да"
+msgstr "/Выгляд/Узыходзіць д_а"
 
 #: src/compose.c:591
 msgid "/_View/R_uler"
-msgstr "/_Выгляд/_Лінейка"
+msgstr "/Выгляд/_Лінейка"
 
 #: src/compose.c:593
 msgid "/_View/_Attachment"
-msgstr "/_Выгляд/Укладанне"
+msgstr "/Выгляд/Дадатак"
 
 #: src/compose.c:595
 msgid "/_View/Cu_stomize toolbar..."
-msgstr "/_Выгляд/Наставіць стужку пр_ылад..."
+msgstr "/Выгляд/Наставіць стужку пр_ылад..."
 
 #: src/compose.c:603 src/mainwindow.c:649 src/messageview.c:173
 msgid "/_View/Character _encoding"
-msgstr "/_Выгляд/Знаказбор"
+msgstr "/Выгляд/Знаказбор"
 
 #: src/compose.c:604
 msgid "/_View/Character _encoding/_Automatic"
-msgstr "/_Выгляд/Знаказбор/Аўтаматычна"
+msgstr "/Выгляд/Знаказбор/Аўтаматычна"
 
 #: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
 #: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
@@ -1404,107 +1393,107 @@ msgstr "/_Выгляд/Знаказбор/Аўтаматычна"
 #: src/compose.c:676 src/mainwindow.c:645 src/mainwindow.c:652
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
-msgstr "/_Выгляд/Знаказбор/---"
+msgstr "/Выгляд/Знаказбор/---"
 
 #: src/compose.c:608 src/mainwindow.c:653 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-msgstr "/_Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
+msgstr "/Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
 
 #: src/compose.c:610 src/mainwindow.c:655 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-msgstr "/_Выгляд/Знаказбор/Юнікод (_UTF-8)"
+msgstr "/Выгляд/Знаказбор/Юнікод (_UTF-8)"
 
 #: src/compose.c:614 src/mainwindow.c:659 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-msgstr "/_Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
+msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
 
 #: src/compose.c:616 src/mainwindow.c:661 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-msgstr "/_Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
+msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
 
 #: src/compose.c:620 src/mainwindow.c:667 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-msgstr "/_Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
+msgstr "/Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
 
 #: src/compose.c:624 src/mainwindow.c:671 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-msgstr "/_Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
+msgstr "/Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
 
 #: src/compose.c:626 src/mainwindow.c:673 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-msgstr "/_Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
+msgstr "/Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
 
 #: src/compose.c:628 src/mainwindow.c:675 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
-msgstr "/_Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
+msgstr "/Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
 
 #: src/compose.c:632 src/mainwindow.c:679 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-msgstr "/_Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
+msgstr "/Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
 
 #: src/compose.c:636 src/mainwindow.c:683 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-msgstr "/_Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
+msgstr "/Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
 
 #: src/compose.c:638 src/mainwindow.c:685 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-msgstr "/_Выгляд/Знаказбор/Арабскі (Windows-1256)"
+msgstr "/Выгляд/Знаказбор/Арабскі (Windows-1256)"
 
 #: src/compose.c:642 src/mainwindow.c:689 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-msgstr "/_Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
+msgstr "/Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
 
 #: src/compose.c:644 src/mainwindow.c:691 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-msgstr "/_Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
+msgstr "/Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
 
 #: src/compose.c:648 src/mainwindow.c:695 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-msgstr "/_Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
+msgstr "/Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
 
 #: src/compose.c:652 src/mainwindow.c:699 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-msgstr "/_Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
+msgstr "/Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
 
 #: src/compose.c:654 src/mainwindow.c:701 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-msgstr "/_Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
+msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
 
 #: src/compose.c:656 src/mainwindow.c:703 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-msgstr "/_Выгляд/Знаказбор/Кірыліца (KOI8-U)"
+msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-U)"
 
 #: src/compose.c:658 src/mainwindow.c:705 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-msgstr "/_Выгляд/Знаказбор/Кірыліца (Windows-1251)"
+msgstr "/Выгляд/Знаказбор/Кірыліца (Windows-1251)"
 
 #: src/compose.c:662 src/mainwindow.c:709 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-msgstr "/_Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
+msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
 
 #: src/compose.c:666 src/mainwindow.c:719 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr "/_Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
+msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
 
 #: src/compose.c:668 src/mainwindow.c:721 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-msgstr "/_Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
+msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
 
 #: src/compose.c:670 src/mainwindow.c:723 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-msgstr "/_Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
+msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
 
 #: src/compose.c:674 src/mainwindow.c:731 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-msgstr "/_Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
+msgstr "/Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
 
 #: src/compose.c:678 src/mainwindow.c:737 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
-msgstr "/_Выгляд/Знаказбор/Тайскі (TIS-620)"
+msgstr "/Выгляд/Знаказбор/Тайскі (TIS-620)"
 
 #: src/compose.c:680 src/mainwindow.c:739 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
-msgstr "/_Выгляд/Знаказбор/Тайскі (Windows-874)"
+msgstr "/Выгляд/Знаказбор/Тайскі (Windows-874)"
 
 #: src/compose.c:684 src/mainwindow.c:799 src/messageview.c:283
 msgid "/_Tools/_Address book"
@@ -1531,7 +1520,7 @@ msgstr "/_Прылады/Рэдагаваць знешнім рэдактара�
 
 #: src/compose.c:694
 msgid "/_Tools/PGP Si_gn"
-msgstr "/_Прылады/Подпіс _PGP"
+msgstr "/_Прылады/_Подпіс PGP"
 
 #: src/compose.c:695
 msgid "/_Tools/PGP _Encrypt"
@@ -1539,7 +1528,7 @@ msgstr "/_Прылады/Шыфр GPG"
 
 #: src/compose.c:700
 msgid "/_Tools/_Check spell"
-msgstr "/_Прылады/_Праверыць правапіс"
+msgstr "/_Прылады/Правяраць правапі_с"
 
 #: src/compose.c:701
 msgid "/_Tools/_Set spell language"
@@ -1591,33 +1580,33 @@ msgstr "Паведамленне: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначана. Выслаць як ёсць?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1625,26 +1614,26 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўкай."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
-msgstr "Нельга захаваць паведамленне ў `дасланых'."
+msgstr "Нельга запісаць паведамленне ў `дасланыя'."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,11 +1644,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
-msgstr "Памылка канверсіі кода"
+msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1672,15 +1661,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1689,88 +1678,88 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 "Паведамленне мае `Bcc'-адрасатаў. Калі гэта паведамленне крыптаваць, ўсе "
-"`Bcc'-адрасаты будуць бачны ў спісе ключоў шыфравання, што вядзе да страты "
+"`Bcc'-адрасаты будуць бачныя ў спісе ключоў шыфравання, што вядзе да страты "
 "прыватнасці.\n"
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "змяшчаю паведамленне ў чаргу...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Ствараю вакно напісання...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1779,48 +1768,48 @@ msgstr ""
 "Знешні рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
-msgstr "Захаваць паведамленне"
+msgstr "Запісаць паведамленне"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
-msgstr "Гэта паведамленне было зменена. Захаваць у каталогу чарнавікоў?"
+msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
-msgstr "Закрыць без захавання"
+msgstr "Закры_ць без запісу"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -1830,7 +1819,7 @@ msgstr "Дадаць новую Асобу"
 
 #: src/editaddress.c:162
 msgid "Edit Person Details"
-msgstr "Змяніць асабовыя звесткі"
+msgstr "Рэдагаваць асабовыя звесткі"
 
 #: src/editaddress.c:303
 msgid "An E-Mail address must be supplied."
@@ -1911,9 +1900,8 @@ msgid "Could not read file."
 msgstr "Нельга прачытаць файл."
 
 #: src/editbook.c:174 src/editbook.c:288
-#, fuzzy
 msgid "Edit Address Book"
-msgstr "Змяніць Адрасную Кнігу"
+msgstr "Рэдагаваць Адрасную кнігу"
 
 #: src/editbook.c:203 src/editjpilot.c:277 src/editvcard.c:190
 msgid " Check File "
@@ -1925,9 +1913,8 @@ msgid "File"
 msgstr "Файл"
 
 #: src/editbook.c:307
-#, fuzzy
 msgid "Add New Address Book"
-msgstr "Дадаць новую адрасную Кнігу"
+msgstr "Дадаць новую Адрасную кнігу"
 
 #: src/editgroup.c:113
 msgid "A Group Name must be supplied."
@@ -2036,7 +2023,7 @@ msgstr "Порт"
 
 #: src/editldap.c:337
 msgid " Check Server "
-msgstr " Спраўдзіць сервер "
+msgstr " Праверыць сервер "
 
 #: src/editldap.c:342 src/editldap_basedn.c:188
 msgid "Search Base"
@@ -2133,16 +2120,15 @@ msgstr "Выберыце файл экспарту"
 
 #: src/filesel.c:158
 msgid "Save as"
-msgstr "Захаваць як"
+msgstr "Запісаць як"
 
 #: src/filesel.c:165 src/filesel.c:279
-#, fuzzy
 msgid "Overwrite existing file"
-msgstr "Перазапісаць існуючы файл?"
+msgstr "Перазапісаць існуючы файл"
 
 #: src/filesel.c:166 src/filesel.c:280
 msgid "The file already exists. Do you want to replace it?"
-msgstr ""
+msgstr "Гэты файл ужо існуе. Жадаеце замяніць яго?"
 
 #: src/filesel.c:183
 msgid "Select directory"
@@ -2194,15 +2180,15 @@ msgstr "Нельга стварыць каталог '%s'."
 
 #: src/folderview.c:247 src/folderview.c:269
 msgid "/Create _new folder..."
-msgstr "/Стварыць новы каталог..."
+msgstr "/С_тварыць новы каталог..."
 
 #: src/folderview.c:248 src/folderview.c:270 src/folderview.c:296
 msgid "/_Rename folder..."
-msgstr "/_Змяніць назву каталога..."
+msgstr "/Змяніць назву _каталогу..."
 
 #: src/folderview.c:249 src/folderview.c:271
 msgid "/_Move folder..."
-msgstr "/_Перанесці каталог..."
+msgstr "/Перанесці каталог..."
 
 #: src/folderview.c:250 src/folderview.c:272 src/folderview.c:297
 msgid "/_Delete folder"
@@ -2210,7 +2196,7 @@ msgstr "/_Выдаліць каталог"
 
 #: src/folderview.c:252 src/folderview.c:274
 msgid "/Empty _trash"
-msgstr "/Ачысціць сметніцу"
+msgstr "/Ачысціць см_етніцу"
 
 #: src/folderview.c:254 src/folderview.c:278 src/folderview.c:301
 msgid "/_Check for new messages"
@@ -2218,15 +2204,15 @@ msgstr "/Праверыць новыя паведамленні"
 
 #: src/folderview.c:256 src/folderview.c:280
 msgid "/R_ebuild folder tree"
-msgstr "/Перабудаваць дрэва каталогаў"
+msgstr "/Перасабраць дрэва каталогаў"
 
 #: src/folderview.c:257 src/folderview.c:281 src/folderview.c:303
 msgid "/_Update summary"
-msgstr "/_Аднавіць зводку"
+msgstr "/Аднавіць зводку"
 
 #: src/folderview.c:259 src/folderview.c:283 src/folderview.c:305
 msgid "/Mar_k all read"
-msgstr "/Пазначыць усе прачытанымі"
+msgstr "/Пазначыць усе чытанымі"
 
 #: src/folderview.c:261 src/folderview.c:285 src/folderview.c:307
 msgid "/_Search messages..."
@@ -2234,7 +2220,7 @@ msgstr "/Шукаць паведамленні..."
 
 #: src/folderview.c:262 src/folderview.c:286 src/folderview.c:308
 msgid "/Ed_it search condition..."
-msgstr "/Рэдагаваць умовы пошуку..."
+msgstr "/Рэдагаваць умовы по_шуку..."
 
 #: src/folderview.c:276 src/folderview.c:299
 msgid "/Down_load"
@@ -2242,7 +2228,7 @@ msgstr "/Загрузіць"
 
 #: src/folderview.c:293
 msgid "/Su_bscribe to newsgroup..."
-msgstr "/Падпісацца на групу навін..."
+msgstr "/Падп_ісацца на групу навін..."
 
 #: src/folderview.c:295
 msgid "/_Remove newsgroup"
@@ -2260,7 +2246,7 @@ msgstr "Новы"
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
 #: src/prefs_summary_column.c:71 src/summaryview.c:566
 msgid "Unread"
-msgstr "Непрачытаны"
+msgstr "Нечытаны"
 
 #: src/folderview.c:440
 msgid "Total"
@@ -2286,23 +2272,23 @@ msgstr "Сканірую каталог %s ..."
 
 #: src/folderview.c:928
 msgid "Rebuild folder tree"
-msgstr "Перабудаваць дрэва каталога"
+msgstr "Перасабраць дрэва каталога"
 
 #: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
-msgstr "Дрэва каталогу будзе перабудаванае. Працягваць?"
+msgstr "Дрэва каталогу будзе перасабранае. Працягваць?"
 
 #: src/folderview.c:938
 msgid "Rebuilding folder tree..."
-msgstr "Адбудоўваю дрэва каталогаў..."
+msgstr "Перазбіраю дрэва каталогаў..."
 
 #: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
-msgstr "Перабудаванне дрэва каталогу схібіла."
+msgstr "Перазборка дрэва каталогу схібіла."
 
 #: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
-msgstr "Спраўджваю новыя паведамленні ва ўсіх каталогах..."
+msgstr "Правяраю новыя паведамленні ва ўсіх каталогах..."
 
 #: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
@@ -2319,14 +2305,13 @@ msgid "Downloading messages in %s ..."
 msgstr "Загрузка паведамленняў з %s..."
 
 #: src/folderview.c:2102
-#, fuzzy, c-format
+#, c-format
 msgid "Download all messages under '%s' ?"
-msgstr "Загрузка паведамленняў з %s..."
+msgstr "Загрузіць усе паведамленні з '%s' ?"
 
 #: src/folderview.c:2105
-#, fuzzy
 msgid "Download all messages"
-msgstr "Загрузка паведамленняў з %s..."
+msgstr "Загрузіць усе паведамленні"
 
 #: src/folderview.c:2154
 #, c-format
@@ -2369,7 +2354,7 @@ msgid ""
 "The real messages are not deleted."
 msgstr ""
 "Выдаліць каталог пошуку `%s' ?\n"
-"Самі паведамленні не будуць выдалены."
+"Самі паведамленні не будуць выдаленыя."
 
 #: src/folderview.c:2483
 msgid "Delete search folder"
@@ -2408,7 +2393,7 @@ msgid ""
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 "Сапраўды выдаліць паштовую скрыню `%s' ?\n"
-"(Паведамленні НЕ будуць выдалены з дыска)"
+"(Паведамленні НЕ будуць выдалены з дыску)"
 
 #: src/folderview.c:2606
 msgid "Remove mailbox"
@@ -2463,7 +2448,7 @@ msgstr "Ствараю прагляд рысунка...\n"
 
 #: src/imageview.c:109
 msgid "Can't load the image."
-msgstr "Нельга загрузіць выяву."
+msgstr "Нельга загрузіць рысунак."
 
 #: src/import.c:154
 msgid "Import"
@@ -2490,9 +2475,8 @@ msgid "Please specify address book name and file to import."
 msgstr "Укажыце імя адраснай кнігі і які файл імпартаваць."
 
 #: src/importcsv.c:154
-#, fuzzy
 msgid "Select and reorder CSV field names to import."
-msgstr "Выберыце і пераімянуйце полі LDIF, якія імпартаваць."
+msgstr "Выберыце і упарадкуйце назвы палёў LDIF, якія імпартаваць."
 
 #: src/importcsv.c:157 src/importldif.c:128
 msgid "File imported."
@@ -2507,19 +2491,16 @@ msgid "Address book name must be supplied."
 msgstr "Павінна быць указана імя адраснай кнігі."
 
 #: src/importcsv.c:528
-#, fuzzy
 msgid "Error reading CSV fields."
-msgstr "Памылка чытання палёў LDIF."
+msgstr "Памылка чытання палёў CSV."
 
 #: src/importcsv.c:554
-#, fuzzy
 msgid "CSV file imported successfully."
-msgstr "Файл LDIF паспяхова імпартаваны."
+msgstr "Файл CSV паспяхова імпартаваны."
 
 #: src/importcsv.c:616
-#, fuzzy
 msgid "Select CSV File"
-msgstr "Выберыце файл vCard"
+msgstr "Выберыце файл CSV"
 
 #: src/importcsv.c:682 src/importldif.c:489
 msgid "File Name"
@@ -2527,29 +2508,27 @@ msgstr "Імя файла"
 
 #: src/importcsv.c:700
 msgid "Comma-separated"
-msgstr ""
+msgstr "Раздзельнікі-кропкі"
 
 #: src/importcsv.c:704
 msgid "Tab-separated"
-msgstr ""
+msgstr "Раздзельнікі-табы"
 
 #: src/importcsv.c:735 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
 #: src/importcsv.c:736
-#, fuzzy
 msgid "CSV Field"
-msgstr "Поле LDIF"
+msgstr "Поле CSV"
 
 #: src/importcsv.c:737
-#, fuzzy
 msgid "Address Book Field"
-msgstr "Адрасная Кніга :"
+msgstr "Поле Адраснай кнігі:"
 
 #: src/importcsv.c:754
 msgid "Reorder address book fields with the Up and Down button."
-msgstr ""
+msgstr "Упарадкуйце палі адраснай кнігі кнопкамі Уверх і Уніз."
 
 #: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:239
@@ -2576,9 +2555,8 @@ msgid "Records :"
 msgstr "Запісы :"
 
 #: src/importcsv.c:882
-#, fuzzy
 msgid "Import CSV file into Address Book"
-msgstr "Імпарт файла LDIF у адрасную кнігу"
+msgstr "Імпарт файла CSV у адрасную кнігу"
 
 #. Button panel
 #: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:69
@@ -2591,12 +2569,11 @@ msgstr "Папярэдні"
 
 #: src/importcsv.c:947 src/importldif.c:766
 msgid "File Info"
-msgstr "Інфармацыя аб файле"
+msgstr "Інфармацыя па файлу"
 
 #: src/importcsv.c:948
-#, fuzzy
 msgid "Fields"
-msgstr "Поле LDIF"
+msgstr "Палі"
 
 #: src/importcsv.c:949 src/importldif.c:768
 msgid "Finish"
@@ -2779,6 +2756,8 @@ msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
+"Выкананне загаду фільтраванне спаму схібіла.\n"
+"Калі ласка, праверце настаўленні кантролю спаму."
 
 #: src/inc.c:1292
 msgid "Connection failed."
@@ -2824,7 +2803,7 @@ msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
-"Паштовая скрыня замкнута:\n"
+"Паштовая скрыня замкнутая:\n"
 "%s"
 
 #: src/inc.c:1341 src/send_message.c:939
@@ -2887,7 +2866,7 @@ msgid ""
 msgstr ""
 "  --attach файл1 [файл2]...\n"
 "                         адкрыць вакно напісання паведамлення з далучаным\n"
-"                         укладаннем з указанага файла (файлаў)"
+"                         дадаткам з указанага файла (файлаў)"
 
 #: src/main.c:523
 msgid "  --receive              receive new messages"
@@ -2915,7 +2894,7 @@ msgstr ""
 
 #: src/main.c:529
 msgid "  --open folderid/msgnum open message in new window"
-msgstr ""
+msgstr "  --open id_каталога/нум_ліста адкрыць паведамленне ў новым вакне"
 
 #: src/main.c:530
 msgid ""
@@ -2925,7 +2904,7 @@ msgstr ""
 
 #: src/main.c:532
 msgid "  --ipcport portnum      specify port for IPC remote commands"
-msgstr ""
+msgstr "  --ipcport нум_порта    задае порт для аддаленых загадаў IPC"
 
 #: src/main.c:534
 msgid "  --exit                 exit Sylpheed"
@@ -2965,10 +2944,10 @@ msgid ""
 "Continue?"
 msgstr ""
 "Кадаванне лакалі - не UTF-8, але пераменная асяродзя G_FILENAME_ENCODING не "
-"ўсталявана.\n"
+"ўсталяваная.\n"
 "Калі кадаванне лакалі ўжываецца для імён файлаў ці каталогаў, яно не будзе "
 "працаваць карэктна.\n"
-"У гэтым выпадку, вы павінны ўсталяваць наступную пераменную асяродзя (гл. "
+"У гэтым выпадку, вы павінны ўстанавіць наступную пераменную асяродзя (гл. "
 "README за дэталямі):\n"
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
@@ -2992,7 +2971,7 @@ msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
 msgstr ""
-"Праграма GnuPG не ўсталявана як след, ці яе версія надта старая.\n"
+"Праграма GnuPG не устаноўлена як след, ці яе версія надта старая.\n"
 "Падтрымка OpenPGP адключана."
 
 #. remote command mode
@@ -3014,84 +2993,84 @@ msgstr ""
 
 #: src/mainwindow.c:521
 msgid "/_File/_Folder"
-msgstr "/_Файл/_Каталог"
+msgstr "/Ф_айл/К_аталог"
 
 #: src/mainwindow.c:522
 msgid "/_File/_Folder/Create _new folder..."
-msgstr "/_Файл/_Каталог/Стварыць новы каталог..."
+msgstr "/Ф_айл/К_аталог/С_тварыць новы каталог..."
 
 #: src/mainwindow.c:524
 msgid "/_File/_Folder/_Rename folder..."
-msgstr "/_Файл/_Каталог/_Пераіменаваць каталог..."
+msgstr "/Ф_айл/К_аталог/Пераіменаваць _каталог..."
 
 #: src/mainwindow.c:525
 msgid "/_File/_Folder/_Move folder..."
-msgstr "/_Файл/_Каталог/_Перанесці каталог..."
+msgstr "/Ф_айл/К_аталог/Перанес_ьці каталог..."
 
 #: src/mainwindow.c:526
 msgid "/_File/_Folder/_Delete folder"
-msgstr "/_Файл/_Каталог/_Выдаліць каталог"
+msgstr "/Ф_айл/К_аталог/_Выдаліць каталог"
 
 #: src/mainwindow.c:527
 msgid "/_File/_Mailbox"
-msgstr "/_Файл/Скрыня"
+msgstr "/Ф_айл/Скрыня"
 
 #: src/mainwindow.c:528
 msgid "/_File/_Mailbox/Add _mailbox..."
-msgstr "/_Файл/Скрыня/Дадаць скрыню..."
+msgstr "/Ф_айл/Скрыня/Дадаць скрыню..."
 
 #: src/mainwindow.c:529
 msgid "/_File/_Mailbox/_Remove mailbox"
-msgstr "/Файл/Скрыня/Выдаліць скрыню"
+msgstr "/Ф_айл/Скрыня/Выдаліць с_крыню"
 
 #: src/mainwindow.c:530 src/mainwindow.c:535
 msgid "/_File/_Mailbox/---"
-msgstr "/_Файл/Скрыня/---"
+msgstr "/Ф_айл/Скрыня/---"
 
 #: src/mainwindow.c:531
 msgid "/_File/_Mailbox/_Check for new messages"
-msgstr "/_Файл/Скрыня/Праверыць новыя лісты"
+msgstr "/Ф_айл/Скрыня/Праверыць новыя лі_сты"
 
 #: src/mainwindow.c:533
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
-msgstr "/_Файл/Скрыня/Праверыць новыя лісты ва ўсіх скрынях"
+msgstr "/Ф_айл/Скрыня/Праверыць новыя лісты ва ўсіх скрынях"
 
 #: src/mainwindow.c:536
 msgid "/_File/_Mailbox/R_ebuild folder tree"
-msgstr "/_Файл/Скрыня/Перабудаваць дрэва каталогаў"
+msgstr "/Ф_айл/Скрыня/Перасабраць дрэва каталогаў"
 
 #: src/mainwindow.c:539
 msgid "/_File/_Import mbox file..."
-msgstr "/_Файл/_Імпартаваць файл mbox..."
+msgstr "/Ф_айл/Імпартаваць файл mbox..."
 
 #: src/mainwindow.c:540
 msgid "/_File/_Export to mbox file..."
-msgstr "/_Файл/_Экспартаваць у mbox..."
+msgstr "/Ф_айл/Экспартаваць _у mbox..."
 
 #: src/mainwindow.c:542
 msgid "/_File/Empty all _trash"
-msgstr "/_Файл/Ачысціць сметніцы"
+msgstr "/Ф_айл/Ачысціць см_етніцы"
 
 #: src/mainwindow.c:544 src/messageview.c:150
 msgid "/_File/_Save as..."
-msgstr "/_Файл/Захаваць як..."
+msgstr "/Ф_айл/Запісаць як..."
 
 #: src/mainwindow.c:547 src/messageview.c:153
 msgid "/_File/Page set_up..."
-msgstr "/_Файл/Настаўленні аркуша..."
+msgstr "/Ф_айл/Настаўленні аркуша..."
 
 #: src/mainwindow.c:549 src/messageview.c:155
 msgid "/_File/_Print..."
-msgstr "/_Файл/_Друкаваць..."
+msgstr "/Ф_айл/Друкаваць..."
 
 #: src/mainwindow.c:551
 msgid "/_File/_Work offline"
-msgstr "/_Файл/Працава_ць без злучэння"
+msgstr "/Ф_айл/Пра_цаваць без злучэння"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
 #: src/mainwindow.c:554
 msgid "/_File/E_xit"
-msgstr "/_Файл/_Выйсці"
+msgstr "/Ф_айл/Выйсці"
 
 #: src/mainwindow.c:559
 msgid "/_Edit/Select _thread"
@@ -3099,7 +3078,7 @@ msgstr "/_Рэдагаваць/Вылучыць нітку"
 
 #: src/mainwindow.c:561 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
-msgstr "/_Рэдагаваць/Знайсці ў бягучым лісце..."
+msgstr "/_Рэдагаваць/Зн_айсці ў бягучым лісце..."
 
 #: src/mainwindow.c:563
 msgid "/_Edit/_Search messages..."
@@ -3107,372 +3086,371 @@ msgstr "/_Рэдагаваць/Знайсці паведамленні..."
 
 #: src/mainwindow.c:566
 msgid "/_View/Show or hi_de"
-msgstr "/_Выгляд/Паказаць або схаваць"
+msgstr "/Выгляд/Паказаць або сха_ваць"
 
 #: src/mainwindow.c:567
 msgid "/_View/Show or hi_de/_Folder tree"
-msgstr "/_Выгляд/Паказаць або схаваць/_Дрэва каталогаў"
+msgstr "/Выгляд/Паказаць або сха_ваць/Дрэв_а каталогаў"
 
 #: src/mainwindow.c:569
 msgid "/_View/Show or hi_de/_Message view"
-msgstr "/_Выгляд/Паказаць або схаваць/Прагляд ліста"
+msgstr "/Выгляд/Паказаць або сха_ваць/Прагляд ліста"
 
 #: src/mainwindow.c:571
 msgid "/_View/Show or hi_de/_Toolbar"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад"
 
 #: src/mainwindow.c:573
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Іконкі і тэкст"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Іконкі і тэкст"
 
 #: src/mainwindow.c:575
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Тэкст справа ад І_конак"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Тэкст справа ад і_конак"
 
 #: src/mainwindow.c:577
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/_Іконкі"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Іконкі"
 
 #: src/mainwindow.c:579
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/_Тэкст"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Тэкст"
 
 #: src/mainwindow.c:581
 msgid "/_View/Show or hi_de/_Toolbar/_None"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Нічога"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Нічога"
 
 #: src/mainwindow.c:583
 msgid "/_View/Show or hi_de/_Search bar"
-msgstr "/_Выгляд/Паказаць або схаваць/Стужка пошуку"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка пошуку"
 
 #: src/mainwindow.c:585
 msgid "/_View/Show or hi_de/Status _bar"
-msgstr "/_Выгляд/Паказаць або схаваць/Стужка статуса"
+msgstr "/Выгляд/Паказаць або сха_ваць/Стужка статусу"
 
 #: src/mainwindow.c:587
 msgid "/_View/_Customize toolbar..."
-msgstr "/_Выгляд/Наставіць стужку прылад..."
+msgstr "/Выгляд/На_ставіць стужку прылад..."
 
 #: src/mainwindow.c:589
 msgid "/_View/Separate f_older tree"
-msgstr "/_Выгляд/_Аддзеленае дрэва каталогаў"
+msgstr "/Выгляд/Аддзеленае дрэва каталога_ў"
 
 #: src/mainwindow.c:590
 msgid "/_View/Separate _message view"
-msgstr "/_Выгляд/Аддзелены прагляд лістоў"
+msgstr "/Выгляд/Аддзелены прагляд лістоў"
 
 #: src/mainwindow.c:592
 msgid "/_View/_Sort"
-msgstr "/_Выгляд/_Сартаваць"
+msgstr "/Выгляд/Сартаваць"
 
 #: src/mainwindow.c:593
 msgid "/_View/_Sort/by _number"
-msgstr "/_Выгляд/_Сартаваць/па нумары"
+msgstr "/Выгляд/Сартаваць/па нумары"
 
 #: src/mainwindow.c:594
 msgid "/_View/_Sort/by s_ize"
-msgstr "/_Выгляд/_Сартаваць/па памеры"
+msgstr "/Выгляд/Сартаваць/па памеры"
 
 #: src/mainwindow.c:595
 msgid "/_View/_Sort/by _date"
-msgstr "/_Выгляд/_Сартаваць/па даце"
+msgstr "/Выгляд/Сартаваць/па даце"
 
 #: src/mainwindow.c:596
 msgid "/_View/_Sort/by t_hread date"
-msgstr "/_Выгляд/_Сартаваць/па даце абмеркавання"
+msgstr "/Выгляд/Сартаваць/па даце абме_ркавання"
 
 #: src/mainwindow.c:597
 msgid "/_View/_Sort/by _from"
-msgstr "/_Выгляд/_Сартаваць/па палі `Ад'"
+msgstr "/Выгляд/Сартаваць/па палі `_Ад'"
 
 #: src/mainwindow.c:598
 msgid "/_View/_Sort/by _recipient"
-msgstr "/_Выгляд/_Сартаваць/па адрасату"
+msgstr "/Выгляд/Сартаваць/па адрасату"
 
 #: src/mainwindow.c:599
 msgid "/_View/_Sort/by _subject"
-msgstr "/_Выгляд/_Сартаваць/па тэме"
+msgstr "/Выгляд/Сартаваць/па тэме"
 
 #: src/mainwindow.c:600
 msgid "/_View/_Sort/by _color label"
-msgstr "/_Выгляд/_Сартаваць/па каляровай метцы"
+msgstr "/Выгляд/Сартаваць/па каляровай метцы"
 
 #: src/mainwindow.c:602
 msgid "/_View/_Sort/by _mark"
-msgstr "/_Выгляд/_Сартаваць/па марцы"
+msgstr "/Выгляд/Сартаваць/па марцы"
 
 #: src/mainwindow.c:603
 msgid "/_View/_Sort/by _unread"
-msgstr "/_Выгляд/_Сартаваць/па непрачытаным"
+msgstr "/Выгляд/Сартаваць/па нечытаным"
 
 #: src/mainwindow.c:604
 msgid "/_View/_Sort/by a_ttachment"
-msgstr "/_Выгляд/_Сартаваць/па ўкладанням"
+msgstr "/Выгляд/Сартаваць/па дадаткам"
 
 #: src/mainwindow.c:606
 msgid "/_View/_Sort/D_on't sort"
-msgstr "/_Выгляд/_Сартаваць/Не сартаваць"
+msgstr "/Выгляд/Сартаваць/Не сартаваць"
 
 #: src/mainwindow.c:607 src/mainwindow.c:610
 msgid "/_View/_Sort/---"
-msgstr "/_Выгляд/_Сартаваць/---"
+msgstr "/Выгляд/Сартаваць/---"
 
 #: src/mainwindow.c:608
 msgid "/_View/_Sort/Ascending"
-msgstr "/_Выгляд/_Сартаваць/Па ўзрастанні"
+msgstr "/Выгляд/Сартаваць/Па ўзрастанні"
 
 #: src/mainwindow.c:609
 msgid "/_View/_Sort/Descending"
-msgstr "/_Выгляд/_Сартаваць/Па ўбыванні"
+msgstr "/Выгляд/Сартаваць/Па ўбыванні"
 
 #: src/mainwindow.c:611
 msgid "/_View/_Sort/_Attract by subject"
-msgstr "/_Выгляд/_Сартаваць/_Сцягваць тэмай"
+msgstr "/Выгляд/Сартаваць/Сцягваць тэмай"
 
 #: src/mainwindow.c:613
 msgid "/_View/Th_read view"
-msgstr "/_Выгляд/Прагляд нітак абмеркавання"
+msgstr "/Выгляд/Прагляд ніта_к абмеркавання"
 
 #: src/mainwindow.c:614
 msgid "/_View/E_xpand all threads"
-msgstr "/_Выгляд/_Разгарнуць усе ніткі"
+msgstr "/Выгляд/Разгарнуць усе ніткі"
 
 #: src/mainwindow.c:615
 msgid "/_View/Co_llapse all threads"
-msgstr "/_Выгляд/_Згарнуць усе ніткі"
+msgstr "/Выгляд/Згарнуць усе ніткі"
 
 #: src/mainwindow.c:616
 msgid "/_View/Set display _item..."
-msgstr "/_Выгляд/Паказваць элементы..."
+msgstr "/Выгляд/Паказваць элементы..."
 
 #: src/mainwindow.c:619
 msgid "/_View/_Go to"
-msgstr "/_Выгляд/_Ісці да"
+msgstr "/Выгляд/Ісці да"
 
 #: src/mainwindow.c:620
 msgid "/_View/_Go to/_Prev message"
-msgstr "/_Выгляд/_Ісці да/_Папярэдні ліст"
+msgstr "/Выгляд/Ісці да/Папярэдні ліст"
 
 #: src/mainwindow.c:621
 msgid "/_View/_Go to/_Next message"
-msgstr "/_Выгляд/_Ісці да/Н_аступны ліст"
+msgstr "/Выгляд/Ісці да/Нас_тупны ліст"
 
 #: src/mainwindow.c:622 src/mainwindow.c:627 src/mainwindow.c:630
 #: src/mainwindow.c:635 src/mainwindow.c:640
 msgid "/_View/_Go to/---"
-msgstr "/_Выгляд/_Ісці да/---"
+msgstr "/Выгляд/Ісці да/---"
 
 #: src/mainwindow.c:623
 msgid "/_View/_Go to/P_rev unread message"
-msgstr "/_Выгляд/_Ісці да/Папярэдні не_прачытаны ліст"
+msgstr "/Выгляд/Ісці да/Папярэдні нечытаны ліст"
 
 #: src/mainwindow.c:625
 msgid "/_View/_Go to/N_ext unread message"
-msgstr "/_Выгляд/_Ісці да/Наступны непрачытаны ліст"
+msgstr "/Выгляд/Ісці да/Наступны нечытаны ліст"
 
 #: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev ne_w message"
-msgstr "/_Выгляд/_Ісці да/Папярэдні _новы ліст"
+msgstr "/Выгляд/Ісці да/Папярэдні новы ліст"
 
 #: src/mainwindow.c:629
 msgid "/_View/_Go to/Ne_xt new message"
-msgstr "/_Выгляд/_Ісці да/_Наступны новы ліст"
+msgstr "/Выгляд/Ісці да/Наступны новы ліст"
 
 #: src/mainwindow.c:631
 msgid "/_View/_Go to/Prev _marked message"
-msgstr "/_Выгляд/_Ісці да/Папярэдні _маркіраваны ліст"
+msgstr "/Выгляд/Ісці да/Папярэдні маркіраваны ліст"
 
 #: src/mainwindow.c:633
 msgid "/_View/_Go to/Next m_arked message"
-msgstr "/_Выгляд/_Ісці да/Наступны маркіраваны ліст"
+msgstr "/Выгляд/Ісці да/Наступны маркіраваны ліст"
 
 #: src/mainwindow.c:636
 msgid "/_View/_Go to/Prev _labeled message"
-msgstr "/_Выгляд/_Ісці да/Папярэдні паме_чаны ліст"
+msgstr "/Выгляд/Ісці да/Папярэдні памечаны ліст"
 
 #: src/mainwindow.c:638
 msgid "/_View/_Go to/Next la_beled message"
-msgstr "/_Выгляд/_Ісці да/_Наступны памечаны ліст"
+msgstr "/Выгляд/Ісці да/Наступны памечаны л_іст"
 
 #: src/mainwindow.c:641
 msgid "/_View/_Go to/Other _folder..."
-msgstr "/_Выгляд/Ісці да/Другі каталог..."
+msgstr "/Выгляд/Ісці да/Другі к_аталог..."
 
 #: src/mainwindow.c:650 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
-msgstr "/_Выгляд/Знаказбор/_Аўтавызначэнне"
+msgstr "/Выгляд/Знаказбор/Аўтавызначэнне"
 
 #: src/mainwindow.c:663 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr "/_Выгляд/Знаказбор/Заходнееўрапейскі (Windows-1252)"
+msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (Windows-1252)"
 
 #: src/mainwindow.c:711 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-msgstr "/_Выгляд/Знаказбор/Японскі (ISO-2022-JP-2)"
+msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-JP-2)"
 
 #: src/mainwindow.c:713 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-msgstr "/_Выгляд/Знаказбор/Японскі (_EUC-JP)"
+msgstr "/Выгляд/Знаказбор/Японскі (_EUC-JP)"
 
 #: src/mainwindow.c:715 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-msgstr "/_Выгляд/Знаказбор/Японскі (_Shift__JIS)"
+msgstr "/Выгляд/Знаказбор/Японскі (_Shift__JIS)"
 
 #: src/mainwindow.c:725 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-msgstr "/_Выгляд/Знаказбор/Традыцыйны Кітайскі (EUC-_TW)"
+msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (EUC-_TW)"
 
 #: src/mainwindow.c:727 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-msgstr "/_Выгляд/Знаказбор/Кітайскі (ISO-2022-_CN)"
+msgstr "/Выгляд/Знаказбор/Кітайскі (ISO-2022-_CN)"
 
 #: src/mainwindow.c:733 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-msgstr "/_Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
+msgstr "/Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
 
 #: src/mainwindow.c:746 src/summaryview.c:503
 msgid "/_View/Open in new _window"
-msgstr "/_Выгляд/Адкрыць у новым вакне"
+msgstr "/Выгляд/Адкры_ць у новым вакне"
 
 #: src/mainwindow.c:747 src/messageview.c:259 src/summaryview.c:505
 msgid "/_View/Mess_age source"
-msgstr "/_Выгляд/Выточны тэкст паведамлення"
+msgstr "/Выгляд/Выточны тэкст паведамлення"
 
 #: src/mainwindow.c:748 src/messageview.c:260 src/summaryview.c:506
 msgid "/_View/All _headers"
-msgstr "/_Выгляд/Усе загалоўкі"
+msgstr "/Выгляд/Усе загалоўкі"
 
 #: src/mainwindow.c:750
 msgid "/_View/_Update summary"
-msgstr "/_Выгляд/_Аднавіць зводку"
+msgstr "/Выгляд/Аднавіць зводку"
 
 #: src/mainwindow.c:752 src/messageview.c:263
 msgid "/_Message"
-msgstr "/_Ліст"
+msgstr "/Ліст"
 
 #: src/mainwindow.c:753
 msgid "/_Message/Recei_ve"
-msgstr "/_Ліст/Атрымаць"
+msgstr "/Ліст/Атры_маць"
 
 #: src/mainwindow.c:754
 msgid "/_Message/Recei_ve/Get from _current account"
-msgstr "/_Ліст/Атрымаць/Атрымаць з бягучага акаунта"
+msgstr "/Ліст/Атры_маць/Атрымаць з бягучага акаунта"
 
 #: src/mainwindow.c:756
 msgid "/_Message/Recei_ve/Get from _all accounts"
-msgstr "/_Ліст/Атрымаць/Атрымаць з усіх акаунтаў"
+msgstr "/Ліст/Атры_маць/Атрымаць з усіх акаунтаў"
 
 #: src/mainwindow.c:758
-#, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
-msgstr "/_Ліст/Атрымаць/Скасаваць атрыманне"
+msgstr "/Ліст/Атры_маць/С_пыніць атрыманне"
 
 #: src/mainwindow.c:760
 msgid "/_Message/Recei_ve/---"
-msgstr "/_Ліст/Атрымаць/---"
+msgstr "/Ліст/Атры_маць/---"
 
 #: src/mainwindow.c:761
 msgid "/_Message/_Send queued messages"
-msgstr "/_Ліст/Выслаць лісты з чаргі"
+msgstr "/Ліст/В_ыслаць лісты з чаргі"
 
 #: src/mainwindow.c:762 src/mainwindow.c:764 src/mainwindow.c:771
 #: src/mainwindow.c:776 src/mainwindow.c:779 src/mainwindow.c:790
 #: src/mainwindow.c:792 src/mainwindow.c:795 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
-msgstr "/_Ліст/---"
+msgstr "/Ліст/---"
 
 #: src/mainwindow.c:763 src/messageview.c:264
 msgid "/_Message/Compose _new message"
-msgstr "/_Ліст/Напісаць новы ліст"
+msgstr "/Ліст/Напісаць новы ліс_т"
 
 #: src/mainwindow.c:765 src/messageview.c:267
 msgid "/_Message/_Reply"
-msgstr "/_Ліст/_Адказаць"
+msgstr "/Ліст/Ад_казаць"
 
 #: src/mainwindow.c:766
 msgid "/_Message/Repl_y to"
-msgstr "/_Ліст/Адказ"
+msgstr "/Ліст/Адказ"
 
 #: src/mainwindow.c:767 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
-msgstr "/_Ліст/Адказ/да ўсіх"
+msgstr "/Ліст/Адказ/да ўсіх"
 
 #: src/mainwindow.c:768 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
-msgstr "/_Ліст/Адказ/адпраўніку"
+msgstr "/Ліст/Адказ/адпраўніку"
 
 #: src/mainwindow.c:769 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
-msgstr "/_Ліст/Адказ/у спіс рассылкі"
+msgstr "/Ліст/Адказ/у спіс рассылкі"
 
 #: src/mainwindow.c:772 src/messageview.c:275
 msgid "/_Message/_Forward"
-msgstr "/_Ліст/Пераслаць"
+msgstr "/Ліст/Пер_аслаць"
 
 #: src/mainwindow.c:773 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
-msgstr "/_Ліст/Пераслаць як укладанне"
+msgstr "/Ліст/Перасла_ць як дадатак"
 
 #: src/mainwindow.c:775 src/messageview.c:278
 msgid "/_Message/Redirec_t"
-msgstr "/_Ліст/Перанакіраваць"
+msgstr "/Ліст/П_еранакіраваць"
 
 #: src/mainwindow.c:777
 msgid "/_Message/M_ove..."
-msgstr "/_Ліст/_Перанесці..."
+msgstr "/Ліст/Перанесці..."
 
 #: src/mainwindow.c:778
 msgid "/_Message/_Copy..."
-msgstr "/_Ліст/_Капіраваць"
+msgstr "/Ліст/Капіраваць"
 
 #: src/mainwindow.c:780
 msgid "/_Message/_Mark"
-msgstr "/_Ліст/_Марка"
+msgstr "/Ліст/Марка"
 
 #: src/mainwindow.c:781
 msgid "/_Message/_Mark/_Mark"
-msgstr "/_Ліст/_Марка/_Маркіраваць"
+msgstr "/Ліст/Марка/Маркіравац_ь"
 
 #: src/mainwindow.c:782
 msgid "/_Message/_Mark/_Unmark"
-msgstr "/_Ліст/_Марка/_Зняць марку"
+msgstr "/Ліст/Марка/Зняць марку"
 
 #: src/mainwindow.c:783
 msgid "/_Message/_Mark/---"
-msgstr "/_Ліст/_Марка/---"
+msgstr "/Ліст/Марка/---"
 
 #: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark as unr_ead"
-msgstr "/_Ліст/_Марка/Пазначыць як непрачытаны"
+msgstr "/Ліст/Марка/Пазначыць як нечытаны"
 
 #: src/mainwindow.c:785
 msgid "/_Message/_Mark/Mark as rea_d"
-msgstr "/_Ліст/_Марка/Пазначыць як прачытаны"
+msgstr "/Ліст/Марка/Пазначыць як прачытаны"
 
 #: src/mainwindow.c:787
 msgid "/_Message/_Mark/Mark _thread as read"
-msgstr "/_Ліст/_Марка/Пазначыць абмеркаванне прачытаным"
+msgstr "/Ліст/Марка/Пазначыць абм_еркаванне прачытаным"
 
 #: src/mainwindow.c:789
 msgid "/_Message/_Mark/Mark all _read"
-msgstr "/_Ліст/_Марка/Пазначыць усе прачытанымі"
+msgstr "/Ліст/Марка/Пазначыць усе прачытанымі"
 
 #: src/mainwindow.c:791
 msgid "/_Message/_Delete"
-msgstr "/_Ліст/_Выдаліць"
+msgstr "/Ліст/_Выдаліць"
 
 #: src/mainwindow.c:793
 msgid "/_Message/Set as _junk mail"
-msgstr "/_Ліст/_Марка/Пазначыць як _спам"
+msgstr "/Ліст/Марка/Пазначыць як спам"
 
 #: src/mainwindow.c:794
 msgid "/_Message/Set as not j_unk mail"
-msgstr "/_Ліст/_Марка/Пазначыць як _не-спам"
+msgstr "/Ліст/Марка/Пазначыць як не-спам"
 
 #: src/mainwindow.c:796 src/messageview.c:280
 msgid "/_Message/Re-_edit"
-msgstr "/_Ліст/Пера-рэдагаваць"
+msgstr "/Ліст/Пера-рэдагаваць"
 
 #: src/mainwindow.c:800
 msgid "/_Tools/Add sender to address boo_k..."
@@ -3480,11 +3458,11 @@ msgstr "/_Прылады/Дадаць адпраўніка ў адрасную �
 
 #: src/mainwindow.c:803
 msgid "/_Tools/_Filter all messages in folder"
-msgstr "/_Прылады/_Фільтраваць усе лісты ў каталогу"
+msgstr "/_Прылады/Фільтр_аваць усе лісты ў каталогу"
 
 #: src/mainwindow.c:805
 msgid "/_Tools/Filter _selected messages"
-msgstr "/_Прылады/Фільтраваць вылучаныя лісты"
+msgstr "/_Прылады/Фільтраваць в_ылучаныя лісты"
 
 #: src/mainwindow.c:807 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
@@ -3492,11 +3470,11 @@ msgstr "/_Прылады/_Стварыць правіла фільтра"
 
 #: src/mainwindow.c:808 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
-msgstr "/_Прылады/_Стварыць правіла фільтра/_Аўтаматычна"
+msgstr "/_Прылады/_Стварыць правіла фільтра/Аўтаматычна"
 
 #: src/mainwindow.c:810 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
-msgstr "/_Прылады/_Стварыць правіла фільтра/па Адпраўніку"
+msgstr "/_Прылады/_Стварыць правіла фільтра/па _Адпраўніку"
 
 #: src/mainwindow.c:812 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
@@ -3508,7 +3486,7 @@ msgstr "/_Прылады/_Стварыць правіла фільтра/па _�
 
 #: src/mainwindow.c:817
 msgid "/_Tools/Filter _junk mails in folder"
-msgstr "/_Прылады/_Фільтраваць спам ў каталогу"
+msgstr "/_Прылады/Фільтраваць спам ў катал_огу"
 
 #: src/mainwindow.c:819
 msgid "/_Tools/Filter junk _mails in selected messages"
@@ -3520,52 +3498,51 @@ msgstr "/Прылады/Выдаліць падвоеныя паведамлен
 
 #: src/mainwindow.c:829
 msgid "/_Tools/E_xecute marked process"
-msgstr "/Прылады/Выканаць пазначанае дзеянне"
+msgstr "/Прылады/Выканаць пазна_чаныя дзеянні"
 
 #: src/mainwindow.c:831
 msgid "/_Tools/_Log window"
-msgstr "/_Прылады/Вакно журн_ала"
+msgstr "/_Прылады/Вакно журналу"
 
 #: src/mainwindow.c:833
 msgid "/_Configuration"
-msgstr "/Наладкі"
+msgstr "/Канфігурацыя"
 
 #: src/mainwindow.c:834
 msgid "/_Configuration/_Common preferences..."
-msgstr "/Наладкі/Пераважанні..."
+msgstr "/Канфігурацыя/Пераважанні..."
 
 #: src/mainwindow.c:836
-#, fuzzy
 msgid "/_Configuration/_Filter settings..."
-msgstr "/Наладкі/Наставіць фільтр"
+msgstr "/Канфігурацыя/Н_аставіць фільтр..."
 
 #: src/mainwindow.c:838
 msgid "/_Configuration/_Template..."
-msgstr "/Наладкі/Шаблон..."
+msgstr "/Канфігурацыя/Шаблон..."
 
 #: src/mainwindow.c:840
 msgid "/_Configuration/_Actions..."
-msgstr "/Наладкі/Дзеянні..."
+msgstr "/Канфігурацыя/Дзеянні..."
 
 #: src/mainwindow.c:842
 msgid "/_Configuration/---"
-msgstr "/Наладкі/---"
+msgstr "/Канфігурацыя/---"
 
 #: src/mainwindow.c:843
 msgid "/_Configuration/_Preferences for current account..."
-msgstr "/Наладкі/Перавагі бягучага акаунта..."
+msgstr "/Канфігурацыя/Пераважанні бягучага акаунта..."
 
 #: src/mainwindow.c:845
 msgid "/_Configuration/Create _new account..."
-msgstr "/Наладкі/Стварыць новы акаунт..."
+msgstr "/Канфігурацыя/С_тварыць новы акаунт..."
 
 #: src/mainwindow.c:847
 msgid "/_Configuration/_Edit accounts..."
-msgstr "/Наладкі/_Рэдагаваць акаунты..."
+msgstr "/Канфігурацыя/Рэдагаваць ака_унты..."
 
 #: src/mainwindow.c:849
 msgid "/_Configuration/C_hange current account"
-msgstr "/Наладкі/Змяніць бягучы акаунт"
+msgstr "/Канфігурацыя/Змяніць бягучы акаунт"
 
 #: src/mainwindow.c:853
 msgid "/_Help/_Manual"
@@ -3597,7 +3574,7 @@ msgstr "/_Даведка/_FAQ/Іспанскі"
 
 #: src/mainwindow.c:860
 msgid "/_Help/_FAQ/_French"
-msgstr "/_Даведка/_FAQ/_Французскі"
+msgstr "/_Даведка/_FAQ/Фр_анцузскі"
 
 #: src/mainwindow.c:861
 msgid "/_Help/_FAQ/_Italian"
@@ -3618,7 +3595,7 @@ msgstr "Ствараю галоўнае вакно...\n"
 #: src/mainwindow.c:1082
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
-msgstr "Галоўнае вакно: размяшчэнне колеру %d схібіла\n"
+msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
 
 #: src/mainwindow.c:1169 src/summaryview.c:2531 src/summaryview.c:2616
 #: src/summaryview.c:4162 src/summaryview.c:4291 src/summaryview.c:4668
@@ -3636,7 +3613,7 @@ msgstr "няма"
 #: src/mainwindow.c:1407
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
-msgstr "Змена тыпу радзельніка вакон з %d на %d\n"
+msgstr "Змена тыпу раздзельніка вакон з %d на %d\n"
 
 #: src/mainwindow.c:1660
 msgid "Offline"
@@ -3696,7 +3673,7 @@ msgstr "Сільфід - Прагляд Паведамлення"
 
 #: src/mainwindow.c:2398 src/mimeview.c:141 src/summaryview.c:457
 msgid "/_Reply"
-msgstr "/_Адказаць"
+msgstr "/Ад_казаць"
 
 #: src/mainwindow.c:2399
 msgid "/Reply to _all"
@@ -3708,15 +3685,15 @@ msgstr "/Адказаць адпраўніку"
 
 #: src/mainwindow.c:2401
 msgid "/Reply to mailing _list"
-msgstr "/Адказаць у ліст рассылкі"
+msgstr "/А_дказаць у спіс рассылкі"
 
 #: src/mainwindow.c:2406 src/summaryview.c:464
 msgid "/_Forward"
-msgstr "/Пераправіць"
+msgstr "/Пер_аправіць"
 
 #: src/mainwindow.c:2407 src/summaryview.c:465
 msgid "/For_ward as attachment"
-msgstr "/Пераслаць як укладанне"
+msgstr "/Перасла_ць як дадатак"
 
 #: src/mainwindow.c:2408 src/summaryview.c:466
 msgid "/Redirec_t"
@@ -3724,30 +3701,27 @@ msgstr "/Перанакіраваць"
 
 #: src/mainwindow.c:2860
 msgid "Icon _and text"
-msgstr ""
+msgstr "Іконкі і тэкст"
 
 #: src/mainwindow.c:2861
-#, fuzzy
 msgid "Text at the _right of icon"
-msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Тэкст справа ад І_конак"
+msgstr "Тэкст справа ад і_конак"
 
 #: src/mainwindow.c:2863
 msgid "_Icon"
-msgstr ""
+msgstr "Іконкі"
 
 #: src/mainwindow.c:2864
-#, fuzzy
 msgid "_Text"
 msgstr "Тэкст"
 
 #: src/mainwindow.c:2865
-#, fuzzy
 msgid "_None"
-msgstr "Няма"
+msgstr "Нічога"
 
 #: src/mainwindow.c:2895
 msgid "You are offline. Click the icon to go online."
-msgstr "Вы не злучаны. Клікніце іконку, каб злучыцца."
+msgstr "Вы не злучаныя. Клікніце іконку, каб злучыцца."
 
 #: src/mainwindow.c:2906
 msgid "You are online. Click the icon to go offline."
@@ -3770,7 +3744,6 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ужыванне: sylpheed [ОПЦЫЯ]..."
 
 #: src/mainwindow.c:3805
-#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3793,14 +3766,14 @@ msgstr ""
 "--send\n"
 "--status [каталог]...\n"
 "--status-full [каталог]...\n"
-"--configdir імя_каталогу\n"
+"--open id_каталога/нум_ліста\n"
+"--configdir імя_каталога\n"
 "--exit\n"
 "--debug\n"
 "--help\n"
 "--version"
 
 #: src/mainwindow.c:3822
-#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3817,12 +3790,13 @@ msgid ""
 "output version information and exit"
 msgstr ""
 "адкрыць вакно напісання\n"
-"адкрыць вакно напісання з укладаннем з указаных файлаў\n"
+"адкрыць вакно напісання з дадаткам з указаных файлаў\n"
 "атрымаць новыя паведамленні\n"
 "атрымаць новыя паведамленні ўсіх акаунтаў\n"
 "выслаць усе паведамленні з чаргі\n"
 "паказаць агульны лік паведамленняў\n"
 "паказаць статус кожнага каталога\n"
+"адкрыць паведамленне ў новым вакне\n"
 "задаць каталог, які ўтрымлівае файлы канфігурацыі\n"
 "выйсці з Сільфід\n"
 "рэжым адладкі\n"
@@ -3876,7 +3850,7 @@ msgstr "Тэкст"
 
 #: src/messageview.c:346
 msgid "Attachments"
-msgstr "Укладанні"
+msgstr "Дадаткі"
 
 #: src/messageview.c:397
 msgid "Message View - Sylpheed"
@@ -3885,7 +3859,7 @@ msgstr "Прагляд паведамлення - Сільфід"
 #: src/messageview.c:756 src/summaryview.c:3718
 #, c-format
 msgid "Can't save the file `%s'."
-msgstr "Нельга захаваць файл `%s'."
+msgstr "Нельга запісаць файл `%s'."
 
 #: src/mimeview.c:134
 msgid "/_Open"
@@ -3901,39 +3875,35 @@ msgstr "/_Паказаць як тэкст"
 
 #: src/mimeview.c:137
 msgid "/_Save as..."
-msgstr "/Захаваць як..."
+msgstr "/Запісаць як..."
 
 #: src/mimeview.c:138
 msgid "/Save _all..."
-msgstr "/Захаваць усе..."
+msgstr "/Запісаць усе..."
 
 #: src/mimeview.c:139 src/summaryview.c:508
 msgid "/_Print..."
 msgstr "/_Друкаваць..."
 
 #: src/mimeview.c:142
-#, fuzzy
 msgid "/_Reply/_Reply"
-msgstr "/_Выгляд/_Адказаць да"
+msgstr "/Ад_казаць/Ад_казаць"
 
 #: src/mimeview.c:143
-#, fuzzy
 msgid "/_Reply/Reply to _all"
-msgstr "/Адказаць усім"
+msgstr "/Ад_казаць/Адказаць усім"
 
 #: src/mimeview.c:145
-#, fuzzy
 msgid "/_Reply/Reply to _sender"
-msgstr "/Адказаць адпраўніку"
+msgstr "/Ад_казаць/Адказаць адпраўніку"
 
 #: src/mimeview.c:147
-#, fuzzy
 msgid "/_Reply/Reply to mailing _list"
-msgstr "/Адказаць у ліст рассылкі"
+msgstr "/Ад_казаць/А_дказаць у спіс рассылкі"
 
 #: src/mimeview.c:151
 msgid "/_Check signature"
-msgstr "/Праверыць подпіс"
+msgstr "/Праверыць подпі_с"
 
 #: src/mimeview.c:179
 msgid "Creating MIME view...\n"
@@ -3945,7 +3915,7 @@ msgstr "Тып MIME "
 
 #: src/mimeview.c:328
 msgid "Select \"Check signature\" to check"
-msgstr "Выберыце \"Спраўдзіць подпіс\" для праверкі"
+msgstr "Выберыце \"Праверыць подпіс\" для праверкі"
 
 #: src/mimeview.c:640
 msgid "Select an action for the attached file:\n"
@@ -3953,7 +3923,7 @@ msgstr "Выберыце дзеянне для далучанага файла:\
 
 #: src/mimeview.c:662
 msgid "Open _with..."
-msgstr "Адкрыць _з..."
+msgstr "Адкры_ць з..."
 
 #: src/mimeview.c:666
 msgid "_Display as text"
@@ -3961,28 +3931,28 @@ msgstr "_Паказаць як тэкст"
 
 #: src/mimeview.c:670
 msgid "_Save as..."
-msgstr "Захаваць як..."
+msgstr "Запісаць як..."
 
 #: src/mimeview.c:716
 msgid ""
 "This signature has not been checked yet.\n"
 "\n"
 msgstr ""
-"Гэты подпіс яшчэ не быў спраўджаны.\n"
+"Гэты подпіс яшчэ не быў правераны.\n"
 "\n"
 
 #: src/mimeview.c:721
 msgid "_Check signature"
-msgstr "Спраўдзіць подпіс"
+msgstr "Праверыць подпі_с"
 
 #: src/mimeview.c:1009 src/mimeview.c:1076 src/mimeview.c:1112
 #: src/mimeview.c:1145 src/mimeview.c:1168 src/mimeview.c:1276
 msgid "Can't save the part of multipart message."
-msgstr "Нельга захаваць частку састаўнога паведамлення."
+msgstr "Нельга запісаць частку састаўнога паведамлення."
 
 #: src/mimeview.c:1089
 msgid "Can't save the attachments."
-msgstr "Нельга захаваць укладанні."
+msgstr "Нельга запісаць дадаткі."
 
 #: src/mimeview.c:1178
 msgid "Open with"
@@ -4009,7 +3979,7 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 "Гэта выконваемы файл. Адкрыццё выконваемых файлаў забаронена для бяспекі.\n"
-"Калі вы жадаеце запусціць яго, захавайце дзе-небудзь, і упэўніцеся, што гэта "
+"Калі вы жадаеце запусціць яго, запішыце дзе-небудзь, і упэўніцеся, што гэта "
 "не вірус ці нешта кшталту шкодных праграм."
 
 #: src/passphrase.c:95
@@ -4439,7 +4409,7 @@ msgstr "Змяшчаць выдаленыя лісты ў"
 
 #: src/prefs_account_dialog.c:1946
 msgid "Account name is not entered."
-msgstr "Не ўведзена імя акаунта."
+msgstr "Не ўведзенае імя акаунта."
 
 #: src/prefs_account_dialog.c:1950
 msgid "Mail address is not entered."
@@ -4678,7 +4648,7 @@ msgstr "Кадаванне імён файлаў MIME"
 
 #: src/prefs_common_dialog.c:927
 msgid "MIME header"
-msgstr "MIME загаловак"
+msgstr "MIME header"
 
 #: src/prefs_common_dialog.c:937
 msgid ""
@@ -4735,7 +4705,7 @@ msgstr "Аўтаматычна запускаць знешні рэдактар"
 
 #: src/prefs_common_dialog.c:1066
 msgid "Undo level"
-msgstr "Глыбіня гісторыі змен"
+msgstr "Глыбіня гісторыі зменаў"
 
 #: src/prefs_common_dialog.c:1086
 msgid "Wrap messages at"
@@ -4755,7 +4725,7 @@ msgstr "Пераносіць пры ўводзе"
 
 #: src/prefs_common_dialog.c:1123
 msgid "Auto-save to draft"
-msgstr "Аўта-захаванне ў чарнавікі"
+msgstr "Аўта-запіс ў чарнавікі"
 
 #: src/prefs_common_dialog.c:1148
 msgid "Format"
@@ -4827,7 +4797,7 @@ msgstr "Паказваць адрасатаў ў слупку `Ад', калі �
 
 #: src/prefs_common_dialog.c:1465
 msgid "Expand threads"
-msgstr "Разгарнуць ніткі"
+msgstr "Разгортваць ніткі"
 
 #: src/prefs_common_dialog.c:1473 src/prefs_common_dialog.c:2822
 #: src/prefs_common_dialog.c:2860
@@ -4936,7 +4906,7 @@ msgstr "Загад вучэння:"
 
 #: src/prefs_common_dialog.c:1837
 msgid "(Select preset)"
-msgstr "(Выберыце прадвызначэнне)"
+msgstr "(Выберыце набор)"
 
 #: src/prefs_common_dialog.c:1862
 msgid "Not Junk"
@@ -4996,7 +4966,7 @@ msgstr "Спыніць дзеянне пасля"
 
 #: src/prefs_common_dialog.c:2014
 msgid "minute(s) "
-msgstr "хвілін(а) "
+msgstr "мінут(а) "
 
 #: src/prefs_common_dialog.c:2028
 msgid "Setting to '0' will store the passphrase for the whole session."
@@ -5020,7 +4990,7 @@ msgstr "Адкрываць першае нечытанае паведамлен�
 
 #: src/prefs_common_dialog.c:2122
 msgid "Remember last selected message"
-msgstr "Запамінаць апошняе вылучанае паведамленне"
+msgstr "Памятаваць апошняе вылучанае паведамленне"
 
 #: src/prefs_common_dialog.c:2126
 msgid "Only mark message as read when opened in new window"
@@ -5028,11 +4998,11 @@ msgstr "Пазначаць паведамленне чытаным толькі
 
 #: src/prefs_common_dialog.c:2130
 msgid "Open inbox after receiving new mail"
-msgstr "Адкрываць Уваходзячыя пасля атрымання новай пошты"
+msgstr "Адкрываць Атрыманыя пасля атрымання новай пошты"
 
 #: src/prefs_common_dialog.c:2132
 msgid "Open inbox on startup"
-msgstr "Адкрываць Уваходзячыя пры старце"
+msgstr "Адкрываць Атрыманыя пры запуску"
 
 #: src/prefs_common_dialog.c:2140
 msgid "Execute immediately when moving or deleting messages"
@@ -5057,7 +5027,7 @@ msgstr "Мінімізаваць у іконку ў трэі"
 
 #: src/prefs_common_dialog.c:2168
 msgid "Toggle window on trayicon click"
-msgstr "Пераключаць вакно па кліку па іконцы ў трэі"
+msgstr "Пераключаць вакно па кліку на іконцы ў трэі"
 
 #: src/prefs_common_dialog.c:2178
 msgid " Set key bindings... "
@@ -5151,7 +5121,7 @@ msgstr "Ужываць знешнюю праграму для адпраўкі"
 
 #: src/prefs_common_dialog.c:2526
 msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Уключыць строгі кантроль цэласнаці кэшу зводкі"
+msgstr "Уключыць строгі кантроль цэласнасці кэшу зводкі"
 
 #: src/prefs_common_dialog.c:2529
 msgid ""
@@ -5325,15 +5295,15 @@ msgstr "дзень месяца як лічба дзесятковая"
 
 #: src/prefs_common_dialog.c:2805
 msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "гадзіна як лічба дзесятковая з ужываннем часу 24-гадзіннага"
+msgstr "гадзіна як лічба дзесятковая ужываючы 24-гадзінны фармат"
 
 #: src/prefs_common_dialog.c:2806
 msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "гадзіна як лічба дзесятковая з ужываннем часу 12-гадзіннага"
+msgstr "гадзіна як лічба дзесятковая ужываючы 12-гадзінны фармат"
 
 #: src/prefs_common_dialog.c:2807
 msgid "the day of the year as a decimal number"
-msgstr "дзень года як лічба дзесятковая"
+msgstr "дзень году як лічба дзесятковая"
 
 #: src/prefs_common_dialog.c:2808
 msgid "the month as a decimal number"
@@ -5341,7 +5311,7 @@ msgstr "месяц як лічба дзесятковая"
 
 #: src/prefs_common_dialog.c:2809
 msgid "the minute as a decimal number"
-msgstr "хвіліна як лічба дзесятковая"
+msgstr "мінута як лічба дзесятковая"
 
 #: src/prefs_common_dialog.c:2810
 msgid "either AM or PM"
@@ -5369,7 +5339,7 @@ msgstr "год як лічба дзесятковая"
 
 #: src/prefs_common_dialog.c:2816
 msgid "the time zone or name or abbreviation"
-msgstr "часовая зона - назва ці скарот"
+msgstr "часавы пояс - назва ці скарот"
 
 #: src/prefs_common_dialog.c:2837
 msgid "Specifier"
@@ -5491,7 +5461,7 @@ msgstr "Звязкі клавіш"
 
 #: src/prefs_common_dialog.c:3382
 msgid "Select the preset of key bindings."
-msgstr "Выберыце прадвызначаныя звязкі клавішаў."
+msgstr "Выберыце набор звязак клавішаў."
 
 #: src/prefs_common_dialog.c:3392 src/prefs_common_dialog.c:3716
 msgid "Default"
@@ -5578,7 +5548,6 @@ msgid " Revert to default "
 msgstr " Вярнуць тыповыя "
 
 #: src/prefs_filter.c:208
-#, fuzzy
 msgid "Filter settings"
 msgstr "Правілы фільтравання"
 
@@ -5645,7 +5614,7 @@ msgstr "Мае каляровую метку"
 
 #: src/prefs_filter_edit.c:504
 msgid "Has attachment"
-msgstr "Мае укладанне"
+msgstr "Мае дадатак"
 
 #: src/prefs_filter_edit.c:517
 msgid "contains"
@@ -5721,7 +5690,7 @@ msgstr "Вызначыць колерам"
 
 #: src/prefs_filter_edit.c:671
 msgid "Mark as read"
-msgstr "Пазначыць як прачытаны"
+msgstr "Пазначыць як чытаны"
 
 #: src/prefs_filter_edit.c:675 src/prefs_toolbar.c:57
 msgid "Forward"
@@ -5729,11 +5698,11 @@ msgstr "Пераслаць"
 
 #: src/prefs_filter_edit.c:676
 msgid "Forward as attachment"
-msgstr "Пераслаць як укладанне"
+msgstr "Пераслаць як дадатак"
 
 #: src/prefs_filter_edit.c:677
 msgid "Redirect"
-msgstr "Паракіраваць"
+msgstr "Перакіраваць"
 
 #: src/prefs_filter_edit.c:681
 msgid "Execute command"
@@ -5865,7 +5834,7 @@ msgstr "Марка"
 #. S_COL_UNREAD
 #: src/prefs_summary_column.c:72
 msgid "Attachment"
-msgstr "Укладанне"
+msgstr "Дадатак"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:5175
@@ -5989,7 +5958,7 @@ msgstr "Пераслаць паведамленне"
 
 #: src/prefs_toolbar.c:61
 msgid "Delete the message"
-msgstr "Выдаліць гэта паведамленне"
+msgstr "Выдаліць гэтае паведамленне"
 
 #: src/prefs_toolbar.c:64
 msgid "Set as junk mail"
@@ -6028,14 +5997,12 @@ msgid "Print message"
 msgstr "Друкаваць паведамленне"
 
 #: src/prefs_toolbar.c:81
-#, fuzzy
 msgid "Stop"
-msgstr "Крок"
+msgstr "Спыніць"
 
 #: src/prefs_toolbar.c:82
-#, fuzzy
 msgid "Stop receiving"
-msgstr "Сервер для атрымання"
+msgstr "Спыніць атрыманне"
 
 #: src/prefs_toolbar.c:87
 msgid "Execute"
@@ -6071,7 +6038,7 @@ msgstr "Чарнавік"
 
 #: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
-msgstr "Захаваць у каталогу чарнавікоў"
+msgstr "Запісаць у каталог чарнавікоў"
 
 #: src/prefs_toolbar.c:106
 msgid "Insert"
@@ -6083,11 +6050,11 @@ msgstr "Уставіць файл"
 
 #: src/prefs_toolbar.c:109
 msgid "Attach"
-msgstr "Укласці"
+msgstr "Далучыць"
 
 #: src/prefs_toolbar.c:110
 msgid "Attach file"
-msgstr "Укласці файл"
+msgstr "Далучыць файл"
 
 #: src/prefs_toolbar.c:113
 msgid "Append signature"
@@ -6119,7 +6086,7 @@ msgstr ""
 
 #: src/printing.c:527
 msgid "The message will be printed with the following command:"
-msgstr "Паведамленне будзе надрукавана з дапамогай наступнага загаду:"
+msgstr "Паведамленне будзе надрукаванае з дапамогай наступнага загаду:"
 
 #: src/printing.c:528
 msgid "(Default print command)"
@@ -6131,7 +6098,7 @@ msgid ""
 "Print command line is invalid:\n"
 "`%s'"
 msgstr ""
-"Памылка загаду друку:\n"
+"Радок загаду друку няправільны:\n"
 "\"%s\""
 
 #: src/progressdialog.c:58
@@ -6144,7 +6111,7 @@ msgstr "Статус"
 
 #: src/query_search.c:423
 msgid "_Save as search folder"
-msgstr "Захаваць як каталог пошуку"
+msgstr "Запісаць як каталог пошуку"
 
 #: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:994
 msgid "Done."
@@ -6166,7 +6133,7 @@ msgstr "(Без Даты)"
 
 #: src/query_search.c:872
 msgid "Save as search folder"
-msgstr "Захаваць як каталог пошуку"
+msgstr "Запісаць як каталог пошуку"
 
 #: src/query_search.c:893
 msgid "Location:"
@@ -6188,11 +6155,11 @@ msgstr "\t\tака \"%s\"\n"
 #: src/rfc2015.c:186
 #, c-format
 msgid "Signature made at %s\n"
-msgstr "Подпіс зроблены пры %s\n"
+msgstr "Подпіс зроблены %s\n"
 
 #: src/rfc2015.c:308 src/sigstatus.c:269
 msgid "Error verifying the signature"
-msgstr "Памылка падчас спраўджання подпісу"
+msgstr "Памылка праверкі подпісу"
 
 #: src/select-keys.c:105
 #, c-format
@@ -6202,7 +6169,7 @@ msgstr "Выберыце ключ для `%s'"
 #: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
-msgstr "Збіранне інфармацыі для \"%s\" ... %c"
+msgstr "Збор інфармацыі для `%s' ... %c"
 
 #: src/select-keys.c:291
 msgid "Select Keys"
@@ -6222,7 +6189,7 @@ msgstr "Дадаць ключ"
 
 #: src/select-keys.c:470
 msgid "Enter another user or key ID:"
-msgstr "Увядзіце іншы карыстальніка ці ID ключа:"
+msgstr "Увядзіце іншы ID карыстальніка ці ключа:"
 
 #: src/select-keys.c:486
 msgid "Trust key"
@@ -6237,8 +6204,8 @@ msgid ""
 msgstr ""
 "Выбраны ключ - не поўнасцю давераны.\n"
 "Калі вы вырашыце крыптаваць паведамленне з гэтым ключом, вы\n"
-"не будзеце ведаць напэўна, што яно пойдзе да персоны, якую вы\n"
-"мелі на ўвазе. Вы давяраеце дастаткова, каб ужываць яго?"
+"не будзеце ведаць напэўна, што яно пойдзе да асобыы, якую вы\n"
+"мелі на ўвазе. Вы давяраеце ключу дастаткова, каб ужываць яго?"
 
 #: src/send_message.c:196
 msgid "Queued message header is broken.\n"
@@ -6252,7 +6219,7 @@ msgstr "Адпраўляю паведамленне, ўжываючы загад
 #: src/send_message.c:567
 #, c-format
 msgid "Can't execute command: %s"
-msgstr "Не можна выканаць загаду: %s"
+msgstr "Немагчыма выканаць загад: %s"
 
 #: src/send_message.c:602
 #, c-format
@@ -6270,9 +6237,8 @@ msgstr "Злучаюся з SMTP серверам: %s ..."
 
 #. ignore errors right after QUIT
 #: src/send_message.c:761
-#, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
-msgstr "Памылка здарылася падчас адпраўкі загаду\n"
+msgstr "Памылка здарылася пасля загаду QUIT (ігнараваная)"
 
 #: src/send_message.c:799
 msgid "Sending HELO..."
@@ -6321,7 +6287,7 @@ msgstr "Адпраўляю паведамленне"
 
 #: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
-msgstr "Памылка падчас высылання паведамлення."
+msgstr "Памылка падчас адпраўкі паведамлення."
 
 #: src/send_message.c:933
 #, c-format
@@ -6329,7 +6295,7 @@ msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr ""
-"Памылка падчас высылання паведамлення:\n"
+"Памылка падчас адпраўкі паведамлення:\n"
 ".%s"
 
 #: src/setup.c:43
@@ -6346,11 +6312,11 @@ msgstr ""
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
-msgstr "Вынік спраўджання подпісу"
+msgstr "Вынік праверкі подпісу"
 
 #: src/sigstatus.c:135
 msgid "Checking signature"
-msgstr "Спраўджанне подпісу"
+msgstr "Праверка подпісу"
 
 #: src/sigstatus.c:208
 #, c-format
@@ -6373,7 +6339,7 @@ msgstr "Правільны подпіс"
 #: src/sigstatus.c:244
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
-msgstr "Подпіс правільны, але ключ для \"%s\" застаецца не давераны"
+msgstr "Подпіс правільны, але ключ для \"%s\" не давераны"
 
 #: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
@@ -6417,7 +6383,7 @@ msgstr "ДРЭННЫ подпіс"
 
 #: src/sigstatus.c:266
 msgid "No public key to verify the signature"
-msgstr "Нестае публічнага ключа, каб спраўдзіць подпіс"
+msgstr "Нестае публічнага ключа, каб праверыць подпіс"
 
 #: src/sourcewindow.c:65
 msgid "Creating source window...\n"
@@ -6439,7 +6405,7 @@ msgstr "%s - Выток"
 
 #: src/sslmanager.c:59
 msgid "SSL certificate verify failed"
-msgstr "Верыфікацыя сертыфіката SSL схібіла"
+msgstr "Верыфікацыя сертыфікату SSL схібіла"
 
 #: src/sslmanager.c:65
 #, c-format
@@ -6458,7 +6424,7 @@ msgstr ""
 "\n"
 "Сертыфікат серверу:\n"
 "  Суб'ект: %s\n"
-"  Выдаўца: %s\n"
+"  Выдавец: %s\n"
 "\n"
 "Прымаеце гэты сертыфікат?"
 
@@ -6525,7 +6491,7 @@ msgstr "/Адказаць/адпраўніку"
 
 #: src/summaryview.c:461
 msgid "/Repl_y to/mailing _list"
-msgstr "/Адказаць/у ліст рассылкі"
+msgstr "/Адказаць/у спіс рассылкі"
 
 #: src/summaryview.c:468
 msgid "/M_ove..."
@@ -6553,7 +6519,7 @@ msgstr "/_Марка/---"
 
 #: src/summaryview.c:475
 msgid "/_Mark/Mark as unr_ead"
-msgstr "/_Марка/Пазначыць як непрачытаны"
+msgstr "/_Марка/Пазначыць як нечытаны"
 
 #: src/summaryview.c:476
 msgid "/_Mark/Mark as rea_d"
@@ -6565,7 +6531,7 @@ msgstr "/_Марка/Пазначыць нітку як чытаную"
 
 #: src/summaryview.c:480
 msgid "/_Mark/Mark all _read"
-msgstr "/_Марка/Пазначыць усе прачытанымі"
+msgstr "/_Марка/Пазначыць усе чытанымі"
 
 #: src/summaryview.c:481
 msgid "/Color la_bel"
@@ -6593,11 +6559,11 @@ msgstr "/Стварыць правіла фільтра"
 
 #: src/summaryview.c:493
 msgid "/Create f_ilter rule/_Automatically"
-msgstr "/Стварыць правіла фільтра/_Аўтаматычна"
+msgstr "/Стварыць правіла фільтра/Аўтаматычна"
 
 #: src/summaryview.c:495
 msgid "/Create f_ilter rule/by _From"
-msgstr "/_Стварыць правіла фільтра/па Адпраўніку"
+msgstr "/_Стварыць правіла фільтра/па _Адпраўніку"
 
 #: src/summaryview.c:497
 msgid "/Create f_ilter rule/by _To"
@@ -6609,7 +6575,7 @@ msgstr "/_Стварыць правіла фільтра/па _Тэме"
 
 #: src/summaryview.c:543
 msgid "Creating summary view...\n"
-msgstr "Стварэнне выгляду зводкі...\n"
+msgstr "Стварэнне прагляду зводкі...\n"
 
 #: src/summaryview.c:565
 msgid "All"
@@ -6621,16 +6587,15 @@ msgstr "Мае каляровую метку"
 
 #: src/summaryview.c:569
 msgid "Have attachment"
-msgstr "Мае укладанне"
+msgstr "Мае дадаткі"
 
 #: src/summaryview.c:571
 msgid "Within 1 day"
-msgstr ""
+msgstr "У межах 1 дня"
 
 #: src/summaryview.c:572
-#, fuzzy
 msgid "Last 5 days"
-msgstr "Фамілія"
+msgstr "Апошнія 5 дзен"
 
 #: src/summaryview.c:581
 msgid "Search:"
@@ -6659,22 +6624,22 @@ msgstr "Шукаць ізноў"
 
 #: src/summaryview.c:1525 src/summaryview.c:1534
 msgid "No more unread messages"
-msgstr "Непрачытаных лістоў болей няма"
+msgstr "Нечытаных лістоў болей няма"
 
 #: src/summaryview.c:1526
 msgid "No unread message found. Search from the end?"
 msgstr ""
-"Непрачытаных паведамленняў не знойдзена.\n"
+"Нечытаных паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
 #: src/summaryview.c:1528
 msgid "No unread messages."
-msgstr "Няма непрачытаных паведамленняў."
+msgstr "Няма нечытаных паведамленняў."
 
 #: src/summaryview.c:1535
 msgid "No unread message found. Go to next folder?"
 msgstr ""
-"Непрачытаных паведамленняў не знойдзена.\n"
+"Нечытаных паведамленняў не знойдзена.\n"
 "Перайсці да наступнага каталога?"
 
 #: src/summaryview.c:1543 src/summaryview.c:1552
@@ -6767,12 +6732,12 @@ msgstr " элемент(ы) вылучаны"
 #: src/summaryview.c:2176
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
-msgstr "%d новых, %d непрачытаных, агулам %d (%s)"
+msgstr "%d новых, %d нечытаных, агулам %d (%s)"
 
 #: src/summaryview.c:2180
 #, c-format
 msgid "%d new, %d unread, %d total"
-msgstr "%d новых, %d непрачытаных, %d агулам"
+msgstr "%d новых, %d нечытаных, %d агулам"
 
 #: src/summaryview.c:2216
 msgid "Sorting summary..."
@@ -6831,7 +6796,7 @@ msgstr "Паведамленне %s/%d размаркіравана\n"
 #: src/summaryview.c:3452
 #, c-format
 msgid "Message %d is set to move to %s\n"
-msgstr "Паведамленне %d пазначана да пераносу да %s\n"
+msgstr "Паведамленне %d пазначана да пераносу ў %s\n"
 
 #: src/summaryview.c:3484
 msgid "Destination is same as current folder."
@@ -6840,7 +6805,7 @@ msgstr "Каталог прызначэння супадае з бягучым."
 #: src/summaryview.c:3550
 #, c-format
 msgid "Message %d is set to copy to %s\n"
-msgstr "Паведамленне %d пазначана да капіравання да %s\n"
+msgstr "Паведамленне %d пазначана да капіравання ў %s\n"
 
 #: src/summaryview.c:3581
 msgid "Destination for copy is same as current folder."
@@ -6848,7 +6813,7 @@ msgstr "Каталог прызначэння копіі супадае з бя�
 
 #: src/summaryview.c:3763
 msgid "Error occurred while processing messages."
-msgstr "Памылка падчас апрацоўкі паведамлення."
+msgstr "Памылка падчас апрацоўкі паведамленняў."
 
 #: src/summaryview.c:4069 src/summaryview.c:4070
 msgid "Building threads..."
@@ -6887,15 +6852,15 @@ msgstr "файл %s ужо існуе\n"
 
 #: src/textview.c:249
 msgid "Creating text view...\n"
-msgstr "Стварэнне выгляду тэксту...\n"
+msgstr "Стварэнне прагляду тэксту...\n"
 
 #: src/textview.c:498
 msgid "This message is encrypted, but its decryption failed.\n"
-msgstr ""
+msgstr "Паведамленне зашыфраванае, а разшыфраванне не атрымалася.\n"
 
 #: src/textview.c:832
 msgid "This message can't be displayed.\n"
-msgstr "Гэта паведамленне не можа быць паказана.\n"
+msgstr "Гэта паведамленне не можа быць паказанае.\n"
 
 #: src/textview.c:856
 msgid ""
@@ -6907,7 +6872,7 @@ msgstr ""
 
 #: src/textview.c:2000
 msgid "Sa_ve this image as..."
-msgstr "Захаваць рысунак як..."
+msgstr "Запісаць рысунак як..."
 
 #: src/textview.c:2016 src/trayicon.c:158
 msgid "Compose _new message"
@@ -6915,15 +6880,15 @@ msgstr "Напісаць новае паведамленне"
 
 #: src/textview.c:2018
 msgid "Add to address _book..."
-msgstr "Дадаць да адраснай кніг_і..."
+msgstr "Дадаць да адраснай кн_ігі..."
 
 #: src/textview.c:2020
 msgid "Copy this add_ress"
-msgstr "Капіраваць _адрас"
+msgstr "_Капіраваць адрас"
 
 #: src/textview.c:2023
 msgid "_Open with Web browser"
-msgstr "Адкрыць Веб-браўзерам"
+msgstr "Адкрыць Веб-бра_ўзерам"
 
 #: src/textview.c:2025
 msgid "Copy this _link"
@@ -6944,7 +6909,7 @@ msgstr ""
 
 #: src/textview.c:2179
 msgid "Fake URL warning"
-msgstr "Папарэджанне - несапраўдны URL"
+msgstr "Папярэджанне - несапраўдны URL"
 
 #: src/trayicon.c:139
 msgid "_Display Sylpheed"
@@ -6960,7 +6925,7 @@ msgstr "Атрымаць з усіх акаунтаў"
 
 #: src/trayicon.c:152
 msgid "_Send queued messages"
-msgstr "Выслаць паведамленні з чаргі"
+msgstr "В_ыслаць паведамленні з чаргі"
 
 #: src/trayicon.c:164
 msgid "E_xit"
@@ -6972,12 +6937,3 @@ msgstr "Сільфід"
 
 #~ msgid "Overwrite"
 #~ msgstr "Перазапіс"
-
-#~ msgid "Edit address"
-#~ msgstr "Змяніць адрас"
-
-#~ msgid " -> "
-#~ msgstr " -> "
-
-#~ msgid " <- "
-#~ msgstr " <- "
diff --git a/po/bg.po b/po/bg.po
index 4bf8edb2..655ac4a5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -679,7 +679,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1214,7 +1214,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1637,34 +1637,34 @@ msgstr "Съобщение: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1672,25 +1672,25 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1701,12 +1701,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1715,15 +1715,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1732,85 +1732,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1820,52 +1820,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
diff --git a/po/cs.po b/po/cs.po
index 4f6ee98f..b230e0ff 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-05-30 20:12+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -686,7 +686,7 @@ msgstr ""
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1201,7 +1201,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1583,33 +1583,33 @@ msgstr "Zpráva: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1617,26 +1617,26 @@ msgstr ""
 "Není zadán účet k odesílání e-mailů.\n"
 "Před odesláním prosím vyberte nějaký účet."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1647,11 +1647,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1664,15 +1664,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1686,83 +1686,83 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1771,48 +1771,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 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:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "Vložit"
 
diff --git a/po/da.po b/po/da.po
index f6fd1c7d..6a8ce34d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -683,7 +683,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1212,7 +1212,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Note"
 
@@ -1635,34 +1635,34 @@ msgstr "Meddelelse: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1670,25 +1670,25 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1699,12 +1699,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1713,15 +1713,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1730,85 +1730,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,52 +1818,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
diff --git a/po/de.po b/po/de.po
index 379add39..8ce170b3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-05-01 12:28+0200\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: de <sylpheed@sraoss.jp>\n"
@@ -684,7 +684,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1206,7 +1206,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1588,33 +1588,33 @@ msgstr "Nachricht: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1622,25 +1622,25 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1651,11 +1651,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1668,15 +1668,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1690,83 +1690,83 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kommandozeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1775,48 +1775,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Einfügen"
 
diff --git a/po/el.po b/po/el.po
index ad9cabb3..2c8bfe03 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -696,7 +696,7 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1233,7 +1233,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1618,33 +1618,33 @@ msgstr "Μήνυμα: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,28 +1652,28 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1701,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1723,86 +1723,86 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,49 +1812,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
diff --git a/po/es.po b/po/es.po
index 4bff90df..5d8b746d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-06-28 00:47+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -682,7 +682,7 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1203,7 +1203,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1585,33 +1585,33 @@ msgstr "Mensaje: %s"
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,27 +1619,27 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1650,11 +1650,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1667,15 +1667,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1689,83 +1689,83 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1774,48 +1774,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 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:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Insertar"
 
diff --git a/po/et.po b/po/et.po
index a8431e28..9456f0fa 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -687,7 +687,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1219,7 +1219,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1643,34 +1643,34 @@ msgstr "Kiri: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,26 +1678,26 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1707,12 +1707,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1721,15 +1721,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1738,86 +1738,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1827,52 +1827,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
diff --git a/po/fr.po b/po/fr.po
index 5a7350b7..69b07e21 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-04-19 16:12+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -697,7 +697,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1220,7 +1220,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Information"
 
@@ -1604,33 +1604,33 @@ msgstr "Message : %s"
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1638,25 +1638,25 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 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:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1667,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1706,83 +1706,83 @@ msgstr ""
 "\n"
 "Envoyer quand même?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1791,50 +1791,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 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:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Insérer"
 
diff --git a/po/gl.po b/po/gl.po
index b08ad23c..6b06a709 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -685,7 +685,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1218,7 +1218,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1642,34 +1642,34 @@ msgstr "Mensaxe: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,25 +1677,25 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1706,12 +1706,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1720,15 +1720,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1737,85 +1737,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1825,52 +1825,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
diff --git a/po/hr.po b/po/hr.po
index 8d7964d6..11ad3608 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -692,7 +692,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1216,7 +1216,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1650,34 +1650,34 @@ msgstr "Poruka: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,25 +1685,25 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1711,12 +1711,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1725,15 +1725,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1742,87 +1742,87 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1832,53 +1832,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
diff --git a/po/hu.po b/po/hu.po
index 230297ca..ba18a437 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-05-19 10:30+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -685,7 +685,7 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1203,7 +1203,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1585,33 +1585,33 @@ msgstr "Levél: %s"
 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:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,26 +1619,26 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő levél küldésekor."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem találtam hozzárendelt kulcsot a kiválasztott kulcs azonosítóhoz `%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1649,11 +1649,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1666,15 +1666,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1689,83 +1689,83 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1774,48 +1774,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 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:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Beszúrás"
 
diff --git a/po/it.po b/po/it.po
index 2000a5f5..1e357f15 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-05-26 09:38+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -685,7 +685,7 @@ msgstr ""
 "tutti»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1207,7 +1207,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1589,33 +1589,33 @@ msgstr "Messaggio: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1623,27 +1623,27 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,11 +1655,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1673,15 +1673,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1695,83 +1695,83 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1780,48 +1780,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Inserisci"
 
diff --git a/po/ja.po b/po/ja.po
index a6e87e76..11098f8e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -682,7 +682,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1201,7 +1201,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1583,33 +1583,33 @@ msgstr "メッセージ: %s"
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1617,25 +1617,25 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1646,11 +1646,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1663,15 +1663,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1685,83 +1685,83 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1770,48 +1770,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "挿入(_I)"
 
diff --git a/po/ko.po b/po/ko.po
index 94c0b6de..c50e10ea 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -676,7 +676,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1202,7 +1202,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "알림"
 
@@ -1626,34 +1626,34 @@ msgstr "메시지: %s"
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1661,25 +1661,25 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1689,12 +1689,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1703,15 +1703,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1720,86 +1720,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1809,52 +1809,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
diff --git a/po/lt.po b/po/lt.po
index 76e58b8a..90e8aa19 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -683,7 +683,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1209,7 +1209,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1595,33 +1595,33 @@ msgstr "Laiškas: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1629,25 +1629,25 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1658,11 +1658,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1675,15 +1675,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1692,83 +1692,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1777,48 +1777,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "Įterpt_i"
 
diff --git a/po/nl.po b/po/nl.po
index 34d88ca0..e53a14e1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -691,7 +691,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1220,7 +1220,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1606,33 +1606,33 @@ msgstr "Bericht: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1640,25 +1640,25 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1669,11 +1669,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1686,15 +1686,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1703,83 +1703,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1788,48 +1788,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Invoegen"
 
diff --git a/po/pl.po b/po/pl.po
index 11d09ab5..3e62791c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -680,7 +680,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1215,7 +1215,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1606,34 +1606,34 @@ msgstr "Wiadomość: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1641,26 +1641,26 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1670,12 +1670,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,83 +1701,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1787,51 +1787,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3773f17d..71c47c4a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-05-28 10:36-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -689,7 +689,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1211,7 +1211,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1593,33 +1593,33 @@ msgstr "Mensagem: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1627,25 +1627,25 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 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:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível obter nenhuma chave associada ao ID selecionado '%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1657,11 +1657,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1674,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1696,83 +1696,83 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1781,48 +1781,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Inserir"
 
diff --git a/po/ro.po b/po/ro.po
index 7b88403a..5ade59b3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-05-25 12:45+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -694,7 +694,7 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda 'Verifică tot'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1225,7 +1225,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1610,34 +1610,34 @@ msgstr "Mesaj: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Îl trimt oricum ?"
 
 # hm ?
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1645,26 +1645,26 @@ msgstr ""
 "Contul pentru trimitere mail nu a fost specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! depinde de traducerea lui Outbox !!!
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în 'Trimise'."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nici o cheie nu a putut fi asociată cu id-ul cheii selectate '%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,11 +1676,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgstr ""
 "\n"
 "Îl trimit oricum ?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1715,83 +1715,83 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1800,48 +1800,48 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Salvează mesajul"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în folderul ciorne ?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Inserează"
 
diff --git a/po/ru.po b/po/ru.po
index c2819303..2a9ab44d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,17 +1,18 @@
 # Russian translation for Sylpheed
 # Copyright (C) 2001-2006 Free Software Foundation, Inc.
 # First version by Aleksey Novodvorsky <aen@logic.ru>, 2001.
-# Updated by Sergey Vlasov <vsu@altlinux.ru>, 2001.
+# Updated by Sergey Vlasov <vsu@altlinux.ru>, 2001, 2006
 # Updated by Dmitry S. Sivachenko <dima@Chg.RU>, 2001.
-#
+# Updated by Andrey Markelov <andrey@markelov.ru>, 2007.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: sylpheed 2.2.6\n"
+"Project-Id-Version: sylpheed 2.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
-"PO-Revision-Date: 2006-06-09 14:30+0400\n"
-"Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
-"Language-Team: Russian <ru@li.org>\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
+"PO-Revision-Date: 2007-07-22 12:53+0400\n"
+"Last-Translator: Andrey Markelov <andrey@markelov.net>\n"
+"Language-Team: Russian <Project-Id-Version: gtranslato>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -272,19 +273,18 @@ msgid "mailbox is owned by another process, waiting...\n"
 msgstr "почтовый ящик занят другим процессом, ожидание...\n"
 
 #: libsylph/mbox.c:339
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock %s\n"
-msgstr "не удалось создать %s\n"
+msgstr "не удалось блокировать %s\n"
 
 #: libsylph/mbox.c:346 libsylph/mbox.c:396
-#, fuzzy
 msgid "invalid lock type\n"
-msgstr "Неверный тип MIME."
+msgstr "Неверный тип блокировки\n"
 
 #: libsylph/mbox.c:382
-#, fuzzy, c-format
+#, c-format
 msgid "can't unlock %s\n"
-msgstr "не удалось создать %s\n"
+msgstr "не удалось разблокировать %s\n"
 
 #: libsylph/mbox.c:417
 msgid "can't truncate mailbox to zero.\n"
@@ -309,9 +309,9 @@ msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
 #: libsylph/mh.c:672
-#, fuzzy, c-format
+#, c-format
 msgid "Copying message %s/%d to %s ...\n"
-msgstr "Копирование сообщения %s%c%d в %s ...\n"
+msgstr "Копирование сообщения %s/%d·to·%s·...\n"
 
 #: libsylph/mh.c:1002 libsylph/mh.c:1015 src/main.c:158
 #, c-format
@@ -446,9 +446,8 @@ msgid "Timestamp syntax error in greeting\n"
 msgstr "Ошибка синтаксиса метки времени в сообщении сервера\n"
 
 #: libsylph/pop.c:170
-#, fuzzy
 msgid "Invalid timestamp in greeting\n"
-msgstr "В сообщении сервера не найдена требуемая метка времени APOP\n"
+msgstr "Не верная метка времени в приветствии\n"
 
 #: libsylph/pop.c:198 libsylph/pop.c:225
 msgid "POP3 protocol error\n"
@@ -509,7 +508,6 @@ msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
 #: libsylph/prefs_common.c:512
-#, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Фильтр спама"
 
@@ -688,7 +686,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -933,9 +931,8 @@ msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
 #: src/addressbook.c:381
-#, fuzzy
 msgid "/_Tools/Import _CSV file"
-msgstr "/Инструменты/Импорт файла LDIF"
+msgstr "/Инструменты/Импорт файла CSV"
 
 #: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:852
 #: src/messageview.c:302
@@ -977,14 +974,12 @@ msgid "/_Delete"
 msgstr "/Удалить"
 
 #: src/addressbook.c:420
-#, fuzzy
 msgid "/_Copy"
 msgstr "/Копировать"
 
 #: src/addressbook.c:421
-#, fuzzy
 msgid "/_Paste"
-msgstr "/Правка/Вставить"
+msgstr "/Вставить"
 
 #: src/addressbook.c:521
 msgid "E-Mail address"
@@ -1033,9 +1028,8 @@ msgid "Lookup"
 msgstr "Найти"
 
 #: src/addressbook.c:712
-#, fuzzy
 msgid "_Close"
-msgstr "Цвета"
+msgstr "Закрыть"
 
 #. Confirm deletion
 #: src/addressbook.c:882
@@ -1117,17 +1111,14 @@ msgstr ""
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
 #: src/addressbook.c:2500
-#, fuzzy
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
 #: src/addressbook.c:2504
-#, fuzzy
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
 #: src/addressbook.c:2539
-#, fuzzy
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
@@ -1162,12 +1153,10 @@ msgstr ""
 "создании новых файлов адресной книги."
 
 #: src/addressbook.c:2646
-#, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
 #: src/addressbook.c:2652
-#, fuzzy
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
@@ -1217,7 +1206,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1372,7 +1361,6 @@ msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
 #: src/compose.c:587
-#, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/Вид/Адрес для ответа"
 
@@ -1384,9 +1372,8 @@ msgid "/_View/---"
 msgstr "/Вид/---"
 
 #: src/compose.c:589
-#, fuzzy
 msgid "/_View/_Followup-To"
-msgstr "/Вид/Группы новостей для ответа"
+msgstr "/Вид/Следовать к"
 
 #: src/compose.c:591
 msgid "/_View/R_uler"
@@ -1397,9 +1384,8 @@ msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
 #: src/compose.c:595
-#, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
-msgstr "/Вид/Перейти/К другой папке..."
+msgstr "/Вид/Настроить панель инструментов"
 
 #: src/compose.c:603 src/mainwindow.c:649 src/messageview.c:173
 msgid "/_View/Character _encoding"
@@ -1446,9 +1432,8 @@ msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-_4)"
 
 #: src/compose.c:628 src/mainwindow.c:675 src/messageview.c:197
-#, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
-msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
+msgstr "/Вид/Кодировка/Балтийская (Windows-1257)"
 
 #: src/compose.c:632 src/mainwindow.c:679 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
@@ -1603,33 +1588,33 @@ msgstr "Сообщение: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,25 +1622,25 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1666,11 +1651,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1683,15 +1668,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
-msgstr ""
+msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 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 "
@@ -1699,84 +1684,88 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
+"Данное сообщение имеет скрытых получателей. Если сообщение зашифровано,то "
+"все получатели будут видны при просмотре списка ключей шифрования.\n"
+"\n"
+"Отправлять?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1786,48 +1775,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
-msgstr ""
+msgstr "Настроить панель инструментов"
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -1918,9 +1907,8 @@ msgid "Could not read file."
 msgstr "Ошибка чтения из файла."
 
 #: src/editbook.c:174 src/editbook.c:288
-#, fuzzy
 msgid "Edit Address Book"
-msgstr "Изменение адресной книги"
+msgstr "Редактировать адресную книгу"
 
 #: src/editbook.c:203 src/editjpilot.c:277 src/editvcard.c:190
 msgid " Check File "
@@ -1932,7 +1920,6 @@ msgid "File"
 msgstr "Файл"
 
 #: src/editbook.c:307
-#, fuzzy
 msgid "Add New Address Book"
 msgstr "Добавление новой адресной книги"
 
@@ -2144,13 +2131,12 @@ msgid "Save as"
 msgstr "Сохранить как"
 
 #: src/filesel.c:165 src/filesel.c:279
-#, fuzzy
 msgid "Overwrite existing file"
-msgstr "Переписать существующий файл?"
+msgstr "Переписать существующий файл"
 
 #: src/filesel.c:166 src/filesel.c:280
 msgid "The file already exists. Do you want to replace it?"
-msgstr ""
+msgstr "Файл существует. Перезаписать?"
 
 #: src/filesel.c:183
 msgid "Select directory"
@@ -2233,7 +2219,6 @@ msgid "/_Update summary"
 msgstr "/Обновить список сообщений"
 
 #: src/folderview.c:259 src/folderview.c:283 src/folderview.c:305
-#, fuzzy
 msgid "/Mar_k all read"
 msgstr "Пометить как прочитанное"
 
@@ -2273,7 +2258,7 @@ msgstr "Не прочитано"
 
 #: src/folderview.c:440
 msgid "Total"
-msgstr ""
+msgstr "Всего"
 
 #: src/folderview.c:573
 msgid "Setting folder info...\n"
@@ -2328,14 +2313,13 @@ msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
 #: src/folderview.c:2102
-#, fuzzy, c-format
+#, c-format
 msgid "Download all messages under '%s' ?"
-msgstr "Загружаются сообщения из %s ..."
+msgstr "Загрузить все сообщения из %s ?"
 
 #: src/folderview.c:2105
-#, fuzzy
 msgid "Download all messages"
-msgstr "Загружаются сообщения из %s ..."
+msgstr "Загружаются все сообщения"
 
 #: src/folderview.c:2154
 #, c-format
@@ -2499,9 +2483,8 @@ msgid "Please specify address book name and file to import."
 msgstr "Укажите название адресной книги и файл для импорта."
 
 #: src/importcsv.c:154
-#, fuzzy
 msgid "Select and reorder CSV field names to import."
-msgstr "Выберите имена полей LDIF и назначьте имена атрибутов."
+msgstr "Выберите и отсортируйте поля CSV для импорта"
 
 #: src/importcsv.c:157 src/importldif.c:128
 msgid "File imported."
@@ -2516,19 +2499,16 @@ msgid "Address book name must be supplied."
 msgstr "Необходимо указать имя адресной книги."
 
 #: src/importcsv.c:528
-#, fuzzy
 msgid "Error reading CSV fields."
-msgstr "Ошибка при чтении полей LDIF."
+msgstr "Ошибка при чтении полей CSV."
 
 #: src/importcsv.c:554
-#, fuzzy
 msgid "CSV file imported successfully."
-msgstr "Файл LDIF успешно импортирован."
+msgstr "Файл CSV успешно импортирован."
 
 #: src/importcsv.c:616
-#, fuzzy
 msgid "Select CSV File"
-msgstr "Выбор файла vCard"
+msgstr "Выбор файла CSV"
 
 #: src/importcsv.c:682 src/importldif.c:489
 msgid "File Name"
@@ -2536,29 +2516,27 @@ msgstr "Имя файла"
 
 #: src/importcsv.c:700
 msgid "Comma-separated"
-msgstr ""
+msgstr "Разделенный запятой"
 
 #: src/importcsv.c:704
 msgid "Tab-separated"
-msgstr ""
+msgstr "Разделенный tab"
 
 #: src/importcsv.c:735 src/importldif.c:530
 msgid "S"
 msgstr "В"
 
 #: src/importcsv.c:736
-#, fuzzy
 msgid "CSV Field"
-msgstr "Поле LDIF"
+msgstr "Поле CSV"
 
 #: src/importcsv.c:737
-#, fuzzy
 msgid "Address Book Field"
-msgstr "Адресная книга:"
+msgstr "Поле адресной книги:"
 
 #: src/importcsv.c:754
 msgid "Reorder address book fields with the Up and Down button."
-msgstr ""
+msgstr "Сортируйте поля адресной книги кнопками вверх и вниз"
 
 #: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:239
@@ -2585,9 +2563,8 @@ msgid "Records :"
 msgstr "Записей:"
 
 #: src/importcsv.c:882
-#, fuzzy
 msgid "Import CSV file into Address Book"
-msgstr "Импорт файла LDIF в адресную книгу"
+msgstr "Импорт файла CSV в адресную книгу"
 
 #. Button panel
 #: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:69
@@ -2603,9 +2580,8 @@ msgid "File Info"
 msgstr "Информация о файле"
 
 #: src/importcsv.c:948
-#, fuzzy
 msgid "Fields"
-msgstr "Поле LDIF"
+msgstr "Поля"
 
 #: src/importcsv.c:949 src/importldif.c:768
 msgid "Finish"
@@ -2657,9 +2633,8 @@ msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed (новых сообщений: %d)"
 
 #: src/inc.c:481
-#, fuzzy
 msgid "Authenticating with POP3"
-msgstr "Аутентификация"
+msgstr "Аутентификация POP3"
 
 #: src/inc.c:507
 msgid "Retrieving new messages"
@@ -2721,9 +2696,9 @@ msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учётной записи %s...\n"
 
 #: src/inc.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Authenticating with POP3"
-msgstr "Аутентификация"
+msgstr "%s: Аутентификация POP3"
 
 #: src/inc.c:841
 #, c-format
@@ -2789,6 +2764,8 @@ msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
+"Не удалось выполненить команду фильтрации спама.\n"
+"Проверьте настройки фильтрации спама."
 
 #: src/inc.c:1292
 msgid "Connection failed."
@@ -2926,7 +2903,7 @@ msgstr ""
 
 #: src/main.c:529
 msgid "  --open folderid/msgnum open message in new window"
-msgstr ""
+msgstr "··--open·folderid/msgnum·открыть сообщение в новом окне"
 
 #: src/main.c:530
 msgid ""
@@ -2935,7 +2912,7 @@ msgstr "  --configdir каталог    указать каталог с фай�
 
 #: src/main.c:532
 msgid "  --ipcport portnum      specify port for IPC remote commands"
-msgstr ""
+msgstr "··--ipcport·portnum······задать портдля удаленной команды IPC"
 
 #: src/main.c:534
 msgid "  --exit                 exit Sylpheed"
@@ -3087,9 +3064,8 @@ msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
 #: src/mainwindow.c:547 src/messageview.c:153
-#, fuzzy
 msgid "/_File/Page set_up..."
-msgstr "/Файл/Сохранить как..."
+msgstr "/Файл/Настройка страницы..."
 
 #: src/mainwindow.c:549 src/messageview.c:155
 msgid "/_File/_Print..."
@@ -3137,9 +3113,8 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки и текст"
 
 #: src/mainwindow.c:575
-#, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
-msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки"
+msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст у иконок"
 
 #: src/mainwindow.c:577
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
@@ -3162,9 +3137,8 @@ msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
 #: src/mainwindow.c:587
-#, fuzzy
 msgid "/_View/_Customize toolbar..."
-msgstr "/Вид/Перейти/К другой папке..."
+msgstr "/Вид/Настройка панели инструментов..."
 
 #: src/mainwindow.c:589
 msgid "/_View/Separate f_older tree"
@@ -3352,7 +3326,6 @@ msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
 #: src/mainwindow.c:748 src/messageview.c:260 src/summaryview.c:506
-#, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Вид/Все заголовки"
 
@@ -3377,7 +3350,6 @@ msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учётных записей"
 
 #: src/mainwindow.c:758
-#, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
@@ -3533,9 +3505,8 @@ msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
 #: src/mainwindow.c:829
-#, fuzzy
 msgid "/_Tools/E_xecute marked process"
-msgstr "Выполнить отмеченный процесс"
+msgstr "/Инструменты/Выполнить отмеченный процесс"
 
 #: src/mainwindow.c:831
 msgid "/_Tools/_Log window"
@@ -3550,9 +3521,8 @@ msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
 #: src/mainwindow.c:836
-#, fuzzy
 msgid "/_Configuration/_Filter settings..."
-msgstr "/Настройка/Настройка фильтров..."
+msgstr "/Настройка/Настройка фильтра..."
 
 #: src/mainwindow.c:838
 msgid "/_Configuration/_Template..."
@@ -3740,24 +3710,21 @@ msgstr "/Перенаправить без изменений"
 
 #: src/mainwindow.c:2860
 msgid "Icon _and text"
-msgstr ""
+msgstr "Иконка и текст"
 
 #: src/mainwindow.c:2861
-#, fuzzy
 msgid "Text at the _right of icon"
-msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки"
+msgstr "Текст справа от иконки"
 
 #: src/mainwindow.c:2863
 msgid "_Icon"
-msgstr ""
+msgstr "Иконка"
 
 #: src/mainwindow.c:2864
-#, fuzzy
 msgid "_Text"
 msgstr "Текст"
 
 #: src/mainwindow.c:2865
-#, fuzzy
 msgid "_None"
 msgstr "Нет"
 
@@ -3787,7 +3754,6 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
 #: src/mainwindow.c:3805
-#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3810,6 +3776,7 @@ msgstr ""
 "--send\n"
 "--status [папка]...\n"
 "--status-full [папка]...\n"
+"--open·folderid/msgnum\n"
 "--configdir каталог\n"
 "--exit\n"
 "--debug\n"
@@ -3817,7 +3784,6 @@ msgstr ""
 "--version"
 
 #: src/mainwindow.c:3822
-#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3840,10 +3806,11 @@ msgstr ""
 "отправить все сообщения из очереди\n"
 "вывести общее число сообщений в папках\n"
 "вывести полное состояние папок\n"
+"открыть сообщение в новом окне\n"
 "указать каталог с файлами конфигурации\n"
-"завершить работу Sylpheed\n"
+"завершить работу c Sylpheed\n"
 "режим отладки\n"
-"отобразить это сообщение и выйти\n"
+"отобразить этоу подсказку и выйти\n"
 "вывести информацию о версии и выйти"
 
 #: src/message_search.c:120
@@ -3929,24 +3896,20 @@ msgid "/_Print..."
 msgstr "/Печать..."
 
 #: src/mimeview.c:142
-#, fuzzy
 msgid "/_Reply/_Reply"
-msgstr "/Вид/Адрес для ответа"
+msgstr "/Ответить/Ответить"
 
 #: src/mimeview.c:143
-#, fuzzy
 msgid "/_Reply/Reply to _all"
-msgstr "/Ответить всем"
+msgstr "/Ответить/Ответить всем"
 
 #: src/mimeview.c:145
-#, fuzzy
 msgid "/_Reply/Reply to _sender"
-msgstr "/Ответить отправителю"
+msgstr "/Ответить/Ответить отправителю"
 
 #: src/mimeview.c:147
-#, fuzzy
 msgid "/_Reply/Reply to mailing _list"
-msgstr "/Ответить в список рассылки"
+msgstr "/Ответить/Ответить в список рассылки"
 
 #: src/mimeview.c:151
 msgid "/_Check signature"
@@ -4197,9 +4160,8 @@ msgid "0 days: remove immediately"
 msgstr "0 дней: удалить немедленно"
 
 #: src/prefs_account_dialog.c:918
-#, fuzzy
 msgid "Download all messages (including already received) on server"
-msgstr "Принимать все сообщения с сервера"
+msgstr "Принять все сообщения с сервера (включая ранее принятые)"
 
 #: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
@@ -4236,9 +4198,8 @@ msgid "Only check INBOX on receiving"
 msgstr "Проверять только папку входящих сообщений (INBOX) при приёме"
 
 #: src/prefs_account_dialog.c:999
-#, fuzzy
 msgid "Filter new messages in INBOX on receiving"
-msgstr "Фильтровать сообщения при приёме"
+msgstr "Фильтровать новые сообщения в INBOX при приеме"
 
 #: src/prefs_account_dialog.c:1001
 msgid "News"
@@ -4305,7 +4266,7 @@ msgstr "Подпись"
 
 #: src/prefs_account_dialog.c:1258
 msgid "Direct input"
-msgstr ""
+msgstr "Прямой ввод"
 
 #: src/prefs_account_dialog.c:1292
 msgid "Command output"
@@ -4328,12 +4289,10 @@ msgid "Reply-To"
 msgstr "Адрес для ответов"
 
 #: src/prefs_account_dialog.c:1403
-#, fuzzy
 msgid "PGP sign message by default"
 msgstr "Подписывать сообщения по умолчанию"
 
 #: src/prefs_account_dialog.c:1405
-#, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Шифровать сообщения по умолчанию"
 
@@ -4744,7 +4703,7 @@ msgstr "По кнопке \"Ответить\" отвечать в список
 
 #: src/prefs_common_dialog.c:1045
 msgid "Inherit recipients on reply to self messages"
-msgstr ""
+msgstr "Включить получателей при ответе нв письмо себе"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
@@ -4859,7 +4818,7 @@ msgstr "Формат даты"
 
 #: src/prefs_common_dialog.c:1494
 msgid " Set display item of summary... "
-msgstr "Установить показываемые поля..."
+msgstr "Установить отображаемые поля..."
 
 #: src/prefs_common_dialog.c:1500
 msgid "Message"
@@ -4993,9 +4952,8 @@ msgid "Filter messages classified as junk on receiving"
 msgstr "Проверять сообщения на спам при приёме"
 
 #: src/prefs_common_dialog.c:1930
-#, fuzzy
 msgid "Filter junk mails before normal filtering"
-msgstr "Удалять обнаруженный спам с сервера при приёме"
+msgstr "Удалять обнаруженный спам перед фильтрацией сообщений"
 
 #: src/prefs_common_dialog.c:1933
 msgid "Delete junk mails from server on receiving"
@@ -5043,28 +5001,24 @@ msgid "Always open messages in summary when selected"
 msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
 
 #: src/prefs_common_dialog.c:2115
-#, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Открыть первое непрочитанное сообщение при входе в папку"
 
 #: src/prefs_common_dialog.c:2122
-#, fuzzy
 msgid "Remember last selected message"
-msgstr "Нет выделенных цветом сообщений"
+msgstr "Запомнить последнее выбранное сообщени"
 
 #: src/prefs_common_dialog.c:2126
 msgid "Only mark message as read when opened in new window"
 msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
 
 #: src/prefs_common_dialog.c:2130
-#, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Перейти в папку \"Входящие\" после приёма новых сообщений"
 
 #: src/prefs_common_dialog.c:2132
-#, fuzzy
 msgid "Open inbox on startup"
-msgstr "Проверять приход новых сообщений при запуске"
+msgstr "Открыть папку новых сообщений при запуске"
 
 #: src/prefs_common_dialog.c:2140
 msgid "Execute immediately when moving or deleting messages"
@@ -5085,11 +5039,11 @@ msgstr "Отображать значок на панели"
 
 #: src/prefs_common_dialog.c:2166
 msgid "Minimize to tray icon"
-msgstr ""
+msgstr "Свернуть в панель задач"
 
 #: src/prefs_common_dialog.c:2168
 msgid "Toggle window on trayicon click"
-msgstr ""
+msgstr "Развернуть окно по щелчку на иконке"
 
 #: src/prefs_common_dialog.c:2178
 msgid " Set key bindings... "
@@ -5117,7 +5071,7 @@ msgstr "Всегда"
 
 #: src/prefs_common_dialog.c:2262
 msgid "Only on manual receiving"
-msgstr "Только при ручном запуске приёма"
+msgstr "Только при запуске приема сообщений вручную"
 
 #: src/prefs_common_dialog.c:2264
 msgid "Never"
@@ -5170,9 +5124,8 @@ msgid "(Default browser)"
 msgstr "(Браузер по умолчанию)"
 
 #: src/prefs_common_dialog.c:2423
-#, fuzzy
 msgid "Use external program for printing"
-msgstr "Использовать внешнюю программу для отправки почты"
+msgstr "Использовать внешнюю программу для печати"
 
 #: src/prefs_common_dialog.c:2445
 msgid "Use external program for incorporation"
@@ -5241,9 +5194,8 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "Прибалтийская (ISO-8859-4)"
 
 #: src/prefs_common_dialog.c:2597
-#, fuzzy
 msgid "Baltic (Windows-1257)"
-msgstr "Арабская (Windows-1256)"
+msgstr "Балтика (Windows-1257)"
 
 #: src/prefs_common_dialog.c:2599
 msgid "Greek (ISO-8859-7)"
@@ -5596,9 +5548,8 @@ msgid "This header is already in the list."
 msgstr "Этот заголовок уже присутствует в списке."
 
 #: src/prefs_display_items.c:125
-#, fuzzy
 msgid "Display items setting"
-msgstr "Настройка отображения заголовков"
+msgstr "Показать настройки"
 
 #: src/prefs_display_items.c:165 src/prefs_summary_column.c:223
 msgid "Available items"
@@ -5613,9 +5564,8 @@ msgid " Revert to default "
 msgstr " Вернуть стандартные настройки "
 
 #: src/prefs_filter.c:208
-#, fuzzy
 msgid "Filter settings"
-msgstr "Настройка фильтров"
+msgstr "Настройки фильтров"
 
 #: src/prefs_filter.c:252
 msgid "Enabled"
@@ -5931,14 +5881,12 @@ msgid "Summary display item setting"
 msgstr "Настройка отображения списка сообщений"
 
 #: src/prefs_summary_column.c:196
-#, fuzzy
 msgid ""
 "Select items to be displayed on the summary view. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
 "Выберите столбцы для отображения в списке сообщений.\n"
-"Можно изменить порядок с помощью кнопок Вверх/Вниз, а также\n"
-"перетаскиванием элементов мышью."
+"Можно изменить порядок с помощью кнопок Вверх/Вниз."
 
 #: src/prefs_template.c:164
 msgid "Template name"
@@ -5981,9 +5929,8 @@ msgid "Do you really want to delete this template?"
 msgstr "Удалить этот шаблон?"
 
 #: src/prefs_toolbar.c:37
-#, fuzzy
 msgid "---- Separator ----"
-msgstr "Разделитель подписи"
+msgstr "---- Разделитель ----"
 
 #: src/prefs_toolbar.c:39
 msgid "Get"
@@ -6034,28 +5981,24 @@ msgid "Set as junk mail"
 msgstr "Пометить как спам"
 
 #: src/prefs_toolbar.c:66
-#, fuzzy
 msgid "Not junk"
 msgstr "Не спам"
 
 #: src/prefs_toolbar.c:67
-#, fuzzy
 msgid "Set as not junk mail"
-msgstr "Пометить как спам"
+msgstr "Пометить как не спам"
 
 #: src/prefs_toolbar.c:70
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
 #: src/prefs_toolbar.c:73
-#, fuzzy
 msgid "Previous unread message"
-msgstr "Следующее непрочитанное сообщение"
+msgstr "Предыдущее непрочитанное сообщение"
 
 #: src/prefs_toolbar.c:75
-#, fuzzy
 msgid "Search"
-msgstr "Поиск:"
+msgstr "Поиск"
 
 #: src/prefs_toolbar.c:76 src/query_search.c:251
 msgid "Search messages"
@@ -6066,19 +6009,16 @@ msgid "Print"
 msgstr "Печать"
 
 #: src/prefs_toolbar.c:79
-#, fuzzy
 msgid "Print message"
-msgstr "Отправить сообщение"
+msgstr "Печатать сообщение"
 
 #: src/prefs_toolbar.c:81
-#, fuzzy
 msgid "Stop"
-msgstr "Шаг"
+msgstr "Стоп"
 
 #: src/prefs_toolbar.c:82
-#, fuzzy
 msgid "Stop receiving"
-msgstr "Сервер для приёма"
+msgstr "Остановить прием"
 
 #: src/prefs_toolbar.c:87
 msgid "Execute"
@@ -6149,19 +6089,16 @@ msgid "Wrap all long lines"
 msgstr "Отформатировать всё сообщение"
 
 #: src/prefs_toolbar.c:221
-#, fuzzy
 msgid "Customize toolbar"
-msgstr "/Вид/Перейти/К другой папке..."
+msgstr "Настроить панель инструментов"
 
 #: src/prefs_toolbar.c:223
-#, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Выберите столбцы для отображения в списке сообщений.\n"
-"Можно изменить порядок с помощью кнопок Вверх/Вниз, а также\n"
-"перетаскиванием элементов мышью."
+"Выберите столбцы для отображения на панели инструментов.\n"
+"Можно изменить порядок с помощью кнопок Вверх/Вниз"
 
 #: src/printing.c:527
 msgid "The message will be printed with the following command:"
@@ -6316,9 +6253,8 @@ msgstr "Соединение с сервером SMTP: %s ..."
 
 #. ignore errors right after QUIT
 #: src/send_message.c:761
-#, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
-msgstr "Произошла ошибка при передаче команды.\n"
+msgstr "Произошла ошибка после команды.QUIT (игнорируется)"
 
 #: src/send_message.c:799
 msgid "Sending HELO..."
@@ -6485,7 +6421,7 @@ msgstr "%s - Исходный текст"
 
 #: src/sslmanager.c:59
 msgid "SSL certificate verify failed"
-msgstr ""
+msgstr "Ошибка проверки SSL-сертификата"
 
 #: src/sslmanager.c:65
 #, c-format
@@ -6499,6 +6435,14 @@ msgid ""
 "\n"
 "Do you accept this certificate?"
 msgstr ""
+"SSL-сертификат·принадлежащий·%s не возможно проверить. Причина:\n"
+"··%s\n"
+"\n"
+"Сертификат сервера:\n"
+"··Субъект:·%s\n"
+"··Выдал:·%s\n"
+"\n"
+"Принять сертификат?"
 
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
@@ -6610,14 +6554,12 @@ msgid "/Color la_bel"
 msgstr "/Выделение цветом"
 
 #: src/summaryview.c:485
-#, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Пометить как спам"
 
 #: src/summaryview.c:486
-#, fuzzy
 msgid "/Set as not j_unk mail"
-msgstr "Пометить как спам"
+msgstr "/Пометить как не спам"
 
 #: src/summaryview.c:488
 msgid "/Re-_edit"
@@ -6665,12 +6607,11 @@ msgstr "С вложениями"
 
 #: src/summaryview.c:571
 msgid "Within 1 day"
-msgstr ""
+msgstr "1 день"
 
 #: src/summaryview.c:572
-#, fuzzy
 msgid "Last 5 days"
-msgstr "Фамилия"
+msgstr "Последние 5 дней"
 
 #: src/summaryview.c:581
 msgid "Search:"
@@ -6915,7 +6856,7 @@ msgstr "Создание области просмотра текста...\n"
 
 #: src/textview.c:498
 msgid "This message is encrypted, but its decryption failed.\n"
-msgstr ""
+msgstr "Сообщение зашифрованно, но расшифровать не удалось\n"
 
 #: src/textview.c:832
 msgid "This message can't be displayed.\n"
@@ -6926,6 +6867,7 @@ msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
+"Текст сообщения не может быть показан. Ошибка записи временного файла.\n"
 
 #: src/textview.c:2000
 msgid "Sa_ve this image as..."
@@ -6969,9 +6911,8 @@ msgid "Fake URL warning"
 msgstr "Внимание - подмена URL"
 
 #: src/trayicon.c:139
-#, fuzzy
 msgid "_Display Sylpheed"
-msgstr "Старые версии Sylpheed"
+msgstr "Вывести Sylpheed"
 
 #: src/trayicon.c:144
 msgid "Get from _current account"
diff --git a/po/sk.po b/po/sk.po
index f444ce57..1ff6190a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -681,7 +681,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1216,7 +1216,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1639,34 +1639,34 @@ msgstr "Správa: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,25 +1674,25 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1703,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1734,85 +1734,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1822,52 +1822,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
diff --git a/po/sl.po b/po/sl.po
index aaa14d8b..16895985 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -689,7 +689,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1221,7 +1221,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1645,34 +1645,34 @@ msgstr "Sporočilo: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1680,25 +1680,25 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1708,12 +1708,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1722,15 +1722,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1739,86 +1739,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1828,52 +1828,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, 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:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
diff --git a/po/sr.po b/po/sr.po
index 8a44a667..f4fd6632 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -689,7 +689,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1215,7 +1215,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1639,34 +1639,34 @@ msgstr "Poruka: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,26 +1674,26 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1703,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1734,86 +1734,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1823,52 +1823,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
diff --git a/po/sv.po b/po/sv.po
index a44abffd..49d28154 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -686,7 +686,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1212,7 +1212,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Notera"
 
@@ -1603,33 +1603,33 @@ msgstr "Meddelande: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,26 +1637,26 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1667,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,83 +1701,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1787,48 +1787,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Infoga"
 
diff --git a/po/tr.po b/po/tr.po
index 9e26ef73..e7d8a87c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -684,7 +684,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1217,7 +1217,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Not"
 
@@ -1632,34 +1632,34 @@ msgstr "İleti: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1667,25 +1667,25 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1696,12 +1696,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1710,15 +1710,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1727,85 +1727,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1815,52 +1815,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
diff --git a/po/uk.po b/po/uk.po
index 798c7c6b..9efc605b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -690,7 +690,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1213,7 +1213,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1598,33 +1598,33 @@ msgstr "Лист: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1632,25 +1632,25 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1661,11 +1661,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,15 +1678,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1700,83 +1700,83 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1785,48 +1785,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "Вставити"
 
diff --git a/po/vi.po b/po/vi.po
index 35dcafa4..889cfa9c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -668,7 +668,7 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1195,7 +1195,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1581,33 +1581,33 @@ msgstr "Thư: %s"
 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:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1615,25 +1615,25 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 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:3021
+#: src/compose.c:3027
 #, 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:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1644,11 +1644,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1661,15 +1661,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1678,83 +1678,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 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:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, 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:5854
+#: src/compose.c:5860
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1763,48 +1763,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 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:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, 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:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "_Chèn"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 620d8bf3..c12f859a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1203,7 +1203,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1597,34 +1597,34 @@ msgstr "邮件：%s"
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1632,25 +1632,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1660,12 +1660,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1674,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1691,85 +1691,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1779,51 +1779,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 29eb8908..1a3106ec 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 15:25+0900\n"
+"POT-Creation-Date: 2007-08-23 15:04+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -683,7 +683,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
-#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4585 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1208,7 +1208,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5863 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1599,33 +1599,33 @@ msgstr "郵件：%s"
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2716
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2831
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2839
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2840
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2899
+#: src/compose.c:2905
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2919
+#: src/compose.c:2925
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1633,25 +1633,25 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2933 src/send_message.c:314
+#: src/compose.c:2939 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2983
+#: src/compose.c:2989
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
+#: src/compose.c:3091 src/compose.c:3386 src/compose.c:3449 src/compose.c:3569
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3118
+#: src/compose.c:3124
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1661,11 +1661,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3124
+#: src/compose.c:3130
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3206
+#: src/compose.c:3212
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,15 +1678,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3210
+#: src/compose.c:3216
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3339
+#: src/compose.c:3345
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3340
+#: src/compose.c:3346
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1695,83 +1695,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3541
+#: src/compose.c:3547
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3629
+#: src/compose.c:3635
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3636
+#: src/compose.c:3642
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4392
+#: src/compose.c:4398
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4445 src/headerview.c:54
+#: src/compose.c:4451 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4519
+#: src/compose.c:4525
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4522
+#: src/compose.c:4528
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4560 src/compose.c:5676
+#: src/compose.c:4566 src/compose.c:5682
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4575 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5572
+#: src/compose.c:5578
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5590
+#: src/compose.c:5596
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5658
+#: src/compose.c:5664
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5678 src/prefs_common_dialog.c:1504
+#: src/compose.c:5684 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5701 src/prefs_folder_item.c:202
+#: src/compose.c:5707 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5702
+#: src/compose.c:5708
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5792
+#: src/compose.c:5798
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5854
+#: src/compose.c:5860
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1781,48 +1781,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6191 src/mainwindow.c:2867
+#: src/compose.c:6197 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
+#: src/compose.c:6313 src/compose.c:6318 src/compose.c:6324
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6409
+#: src/compose.c:6415
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6432
+#: src/compose.c:6438
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6467
+#: src/compose.c:6473
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6468
+#: src/compose.c:6474
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6470
+#: src/compose.c:6476
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6512
+#: src/compose.c:6518
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6514
+#: src/compose.c:6520
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6515
+#: src/compose.c:6521
 msgid "_Insert"
 msgstr "插入(_I)"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2007-08-23 10:26:55 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2007-08-23 10:26:55 +0000
commit	59265e30628b9ecef897d8c9d3a9b9d8b72a4d82 (patch)
tree	e2627d8dc24701f8979e87b24789a7ab902ba697 /po
parent	d317bb77282ba4e6b1e5e94924827d1b2c60f69a (diff)