From b3dbdba010e21ab264da996509c9f6b67622ea8a Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 16 May 2008 02:45:21 +0000
Subject: updated po files.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1993 ee746299-78ed-0310-b773-934348b2243d
---
 po/ChangeLog |   4 +
 po/be.po     | 370 +++++++++++++++++++--------------------
 po/bg.po     | 370 +++++++++++++++++++--------------------
 po/cs.po     | 424 ++++++++++++++++++++++----------------------
 po/da.po     | 370 +++++++++++++++++++--------------------
 po/de.po     | 370 +++++++++++++++++++--------------------
 po/el.po     | 370 +++++++++++++++++++--------------------
 po/es.po     | 370 +++++++++++++++++++--------------------
 po/et.po     | 370 +++++++++++++++++++--------------------
 po/fr.po     | 370 +++++++++++++++++++--------------------
 po/gl.po     | 370 +++++++++++++++++++--------------------
 po/hr.po     | 370 +++++++++++++++++++--------------------
 po/hu.po     | 370 +++++++++++++++++++--------------------
 po/it.po     | 370 +++++++++++++++++++--------------------
 po/ja.po     | 370 +++++++++++++++++++--------------------
 po/ko.po     | 370 +++++++++++++++++++--------------------
 po/lt.po     | 370 +++++++++++++++++++--------------------
 po/nl.po     | 370 +++++++++++++++++++--------------------
 po/pl.po     | 370 +++++++++++++++++++--------------------
 po/pt_BR.po  | 413 +++++++++++++++++++++----------------------
 po/ro.po     | 564 +++++++++++++++++++++++++++++------------------------------
 po/ru.po     | 370 +++++++++++++++++++--------------------
 po/sk.po     | 370 +++++++++++++++++++--------------------
 po/sl.po     | 370 +++++++++++++++++++--------------------
 po/sr.po     | 370 +++++++++++++++++++--------------------
 po/sv.po     | 370 +++++++++++++++++++--------------------
 po/tr.po     | 370 +++++++++++++++++++--------------------
 po/uk.po     | 370 +++++++++++++++++++--------------------
 po/vi.po     | 370 +++++++++++++++++++--------------------
 po/zh_CN.po  | 370 +++++++++++++++++++--------------------
 po/zh_TW.po  | 370 +++++++++++++++++++--------------------
 31 files changed, 5690 insertions(+), 5705 deletions(-)

(limited to 'po')

diff --git a/po/ChangeLog b/po/ChangeLog
index dc8ac36f..64d46c4f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-16
+
+	* updated cs.po, pt_BR.po and ro.po.
+
 2008-04-11
 
 	* updated pt_BR.po and ro.po.
diff --git a/po/be.po b/po/be.po
index d76513b4..7d0c652d 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -502,11 +502,11 @@ msgstr "Знайдзена: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Канфігурацыя запісана.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Фільтр непажаданай пошты (ручны)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Фільтр непажаданай пошты"
 
@@ -679,7 +679,7 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -814,7 +814,7 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адрас"
@@ -828,7 +828,7 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
@@ -849,8 +849,8 @@ msgstr "/Ф_айл/Новы _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -869,21 +869,21 @@ msgstr "/Ф_айл/_Выдаліць"
 msgid "/_File/_Save"
 msgstr "/Ф_айл/Запісаць"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закрыць"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Рэдагаваць"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Рэдагаваць/Капіраваць"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Рэдагаваць/Ўставіць"
 
@@ -915,7 +915,7 @@ msgstr "/_Адрас/Рэдагаваць"
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/_Выдаліць"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
@@ -928,12 +928,12 @@ msgstr "/_Прылады/Імпартаваць файл _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Даведка"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Даведка/_Аб праграме"
@@ -951,7 +951,7 @@ msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -988,17 +988,17 @@ msgstr "Адрасная кніга"
 msgid "Name:"
 msgstr "Імя:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Да:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скр.копія:"
@@ -1200,7 +1200,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабісты адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1251,395 +1251,395 @@ msgstr "Карычневы"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Няма"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Дадаць..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Выдаліць"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Уласцівасці..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/Ф_айл/В_ыслаць"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/Ф_айл/Выслаць пазней"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/Ф_айл/Запісаць у каталог чарна_вікоў"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/Ф_айл/Запісаць і рэдагаваць да_лей"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/Ф_айл/Далучыць _файл"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/Ф_айл/Ўставіць файл"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/Ф_айл/Ўставіць _подпіс"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/Ф_айл/Далучыць подпіс"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Рэдагаваць/Адкаціць"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Рэдагаваць/Паўтарыць"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Рэдагаваць/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Рэдагаваць/Выразаць"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Рэдагаваць/Ўставіць як цытату"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Рэдагаваць/Вылучыць усё"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Рэдагаваць/Завярну_ць бягучы параграф"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Рэдагаваць/Перанесці усе _доўгія радкі"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Рэдагаваць/А_ўтаперанос"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Выгляд"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/Выгляд/_Да"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/Выгляд/_Копія"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/Выгляд/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/Выгляд/Ад_казваць"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Выгляд/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/Выгляд/Узыходзіць д_а"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/Выгляд/_Лінейка"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/Выгляд/Дадатак"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Выгляд/Наставіць стужку пр_ылад..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Выгляд/Знаказбор"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Выгляд/Знаказбор/Аўтаматычна"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Выгляд/Знаказбор/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Выгляд/Знаказбор/Юнікод (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Выгляд/Знаказбор/Арабскі (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Выгляд/Знаказбор/Тайскі (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Выгляд/Знаказбор/Тайскі (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Прылады/_Адрасная кніга"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Прылады/_Шаблон"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Прылады/Дзеянні"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Прылады/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Прылады/Рэдагаваць знешнім рэдактарам"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Прылады/_Подпіс PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Прылады/Шыфр GPG"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Прылады/Правяраць правапі_с"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову правапісу"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэксту\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файлу %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначана. Выслаць як ёсць?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Дадаткі"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Аўтаматычна ўстаўляць наступныя адрасы"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Адпраўка"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1647,26 +1647,26 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўкай."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Нельга запісаць паведамленне ў `дасланыя'."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1677,11 +1677,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1694,15 +1694,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1716,89 +1716,89 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "змяшчаю паведамленне ў чаргу...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл пазнак.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Ствараю вакно напісання...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1807,48 +1807,48 @@ msgstr ""
 "Знешні рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -2786,7 +2786,7 @@ msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Атрыманне (%d ліст(оў) (%s) атрымана)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3652,7 +3652,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "зроблена.\n"
 
@@ -3905,7 +3905,7 @@ msgstr "Дадаткі"
 msgid "Message View - Sylpheed"
 msgstr "Прагляд паведамлення - Сільфід"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Нельга запісаць файл `%s'."
@@ -5909,17 +5909,17 @@ msgid "Attachment"
 msgstr "Дадатак"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тэма"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Ад"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
 
@@ -5929,7 +5929,7 @@ msgid "Number"
 msgstr "Нумар"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Да:"
@@ -6873,92 +6873,92 @@ msgstr "Настаўленне зводкі з дадзеных паведамл
 msgid "Writing summary cache (%s)..."
 msgstr "Запісваю кэш зводкі (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Паведамленне %d маркіравана\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Паведамленне %d маркіравана як чытанае\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Паведамленне %d маркіравана як нечытанае\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Паведамленне %s/%d пазначана да выдалення\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Выдаліць паведамленне(і)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Сапраўды жадаеце выдаліць паведамленне(і) з сметніцы?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Выдаляю падвоеныя паведамленні..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Паведамленне %s/%d размаркіравана\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Паведамленне %d пазначана да пераносу ў %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Каталог прызначэння супадае з бягучым."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Паведамленне %d пазначана да капіравання ў %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Каталог прызначэння копіі супадае з бягучым."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Памылка падчас апрацоўкі паведамленняў."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Зборка нітак..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Разгрупаванне..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтраванне (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "фільтраванне..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Фільтраванне..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d ліст(ы) прафільтраваны."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Не."
 
diff --git a/po/bg.po b/po/bg.po
index 01458389..8cebbc35 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -501,12 +501,12 @@ msgstr "Намерени %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройките са запазени.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Папка"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Папка"
@@ -679,7 +679,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -816,7 +816,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адрес"
@@ -830,7 +830,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
@@ -852,8 +852,8 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -872,21 +872,21 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
@@ -918,7 +918,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -932,12 +932,12 @@ msgstr "/_Инструменти/Внасяне на _LDIF файл"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -955,7 +955,7 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -994,17 +994,17 @@ msgstr "Адресна книга"
 msgid "Name:"
 msgstr "Име:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1216,7 +1216,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1267,437 +1267,437 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Притурки"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1705,25 +1705,25 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1734,12 +1734,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1748,15 +1748,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1765,91 +1765,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,52 +1859,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2863,7 +2863,7 @@ msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3763,7 +3763,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -4001,7 +4001,7 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
@@ -6104,17 +6104,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
 
@@ -6124,7 +6124,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "До:"
@@ -7073,93 +7073,93 @@ msgstr "Съставяне на извадката от данните на съ
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
diff --git a/po/cs.po b/po/cs.po
index cfdab49e..f1203b04 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,5 +1,5 @@
 # Czech translation of Sylpheed.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2007, 2008 the author(s) of Sylpheed.
 # This file is distributed under the same license as the sylpheed package.
 # Jan Mura <jan_mura@altavista.com>, 2000.
 #
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
-"PO-Revision-Date: 2008-01-19 00:11+0100\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
+"PO-Revision-Date: 2008-04-19 04:07+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
 "MIME-Version: 1.0\n"
@@ -509,11 +509,11 @@ msgstr "Nalezeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavení je uloženo.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Filtr nevyžádané pošty (ruční)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Filtr nevyžádané pošty"
 
@@ -686,7 +686,7 @@ msgstr ""
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -835,7 +835,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
@@ -856,8 +856,8 @@ msgstr "/_Soubor/Nový _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -876,21 +876,21 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
@@ -922,7 +922,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -935,12 +935,12 @@ msgstr "/_Nástroje/Importovat soubor _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -958,7 +958,7 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -995,17 +995,17 @@ msgstr "Adresář"
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
@@ -1203,7 +1203,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1254,395 +1254,392 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Nespecifikováno"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Odeslat"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Soubor/Odesla_t později"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Soubor/Uložit do složky _konceptů"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Soubor/Uložit a pok_račovat v úpravě"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Přiložit soubor"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit podpi_s"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Soubor/Připo_jit podpis"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/Za_rovnat aktuální odstavec"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zar_ovnat všechny dlouhé řádky"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/A_utomatické zarovnávání"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Příjemce"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/_Odesílatel"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/S_krytá kopie"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/Z_obrazit/Odpovědi z_aslat na"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/Z_obrazit/Odpovědi _vystavit na"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Z_obrazit/Up_ravit nástrojovou lištu..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Znaková _sada"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Z_obrazit/Znaková _sada/_Automaticky rozpoznat"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Znaková _sada/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/Znaková _sada/7bitový ASCII (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/Znaková _sada/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/Znaková _sada/Středoevropské jazyky (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/Znaková _sada/_Pobaltské jazyky (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/Znaková _sada/Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/Znaková _sada/Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/Znaková _sada/Japonština (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/Znaková _sada/Tradiční čínština (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/Znaková _sada/Korejština (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
-msgstr "/_Nástroje/Adresá_ř"
+msgstr "/_Nástroje/Ad_resář"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Nástroje/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/Podepsat P_GP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Nástroje/Ši_frovat PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/Kontrolovat pravopi_s"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:2913
-#, fuzzy
+#: src/compose.c:2917
 msgid "Attachment is missing"
-msgstr "Přílohy"
+msgstr "Příloha není obsažena"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
-msgstr ""
+msgstr "Není obsažena příloha. Odeslat bez příloh?"
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
-msgstr ""
+msgstr "Zkontrolovat příjemce"
 
-#: src/compose.c:3077
-#, fuzzy
+#: src/compose.c:3081
 msgid "Really send this mail to the following addresses?"
-msgstr "Automaticky nastavovat následující adresy"
+msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:3205
-#, fuzzy
+#: src/compose.c:3209
 msgid "_Send"
-msgstr "Odeslat"
+msgstr "_Odeslat"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1650,26 +1647,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:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Při posílání zprávy na %s se vyskytla chyba."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1680,11 +1677,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1697,15 +1694,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1719,89 +1716,89 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1810,48 +1807,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -2790,7 +2787,7 @@ msgstr "Přijímá se zpráva (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Přijímá se (zpráv %d, přijato [%s])"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3126,9 +3123,8 @@ msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Hledat zpráv_y..."
 
 #: src/mainwindow.c:569
-#, fuzzy
 msgid "/_Edit/_Quick search"
-msgstr "/Úp_ravy/V_ložit"
+msgstr "/Ú_pravy/_Rychlé hledání"
 
 #: src/mainwindow.c:572
 msgid "/_View/Show or hi_de"
@@ -3657,7 +3653,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3911,7 +3907,7 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr "Zobrazení zprávy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nelze uložit soubor \"%s\"."
@@ -4717,18 +4713,21 @@ msgstr ""
 "RFC 2231: vyhovuje standardům, ale nepoužívané."
 
 #: src/prefs_common_dialog.c:973
+#, fuzzy
 msgid ""
 "Notify for missing attachments when the following strings (comma-separated) "
 "are found in the message body"
 msgstr ""
+"Potvrzovat přílohy, jsou-li v těle zprávy nalezeny následující (čárkou "
+"oddělené) řetězce"
 
 #: src/prefs_common_dialog.c:984
 msgid "(Ex: attach)"
-msgstr ""
+msgstr "(Např.: přikládám)"
 
 #: src/prefs_common_dialog.c:995
 msgid "Confirm recipients before sending"
-msgstr ""
+msgstr "Potvrzovat před odesláním příjemce"
 
 #: src/prefs_common_dialog.c:1001
 msgid "Excluded addresses/domains (comma-separated):"
@@ -5915,17 +5914,17 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Odesílatel"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -5935,7 +5934,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "Příjemce"
 
@@ -6197,19 +6196,17 @@ msgid "_Save as search folder"
 msgstr "Uložit _jako složku hledání"
 
 #: src/query_search.c:547
-#, fuzzy
 msgid "Message not found."
-msgstr "nalezených zpráv %d.\n"
+msgstr "Zpráva nenalezena."
 
 #: src/query_search.c:549
-#, fuzzy
 msgid "1 message found."
-msgstr "nalezených zpráv %d.\n"
+msgstr "1 nalezená zpráva."
 
 #: src/query_search.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "%d messages found."
-msgstr "nalezených zpráv %d.\n"
+msgstr "nalezených zpráv %d."
 
 #: src/query_search.c:579
 #, c-format
@@ -6421,14 +6418,13 @@ msgstr ""
 "%s"
 
 #: src/send_message.c:954
-#, fuzzy
 msgid "Can't connect to SMTP server."
-msgstr "Nelze se spojit se serverem NNTP: %s:%d\n"
+msgstr "Nelze se spojit se serverem SMTP."
 
 #: src/send_message.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to SMTP server: %s:%d"
-msgstr "Nelze se spojit se serverem NNTP: %s:%d\n"
+msgstr "Nelze se spojit se serverem SMTP: %s:%d"
 
 #: src/setup.c:43
 msgid "Mailbox setting"
@@ -6561,18 +6557,16 @@ msgstr ""
 "Přijmete tento certifikát?"
 
 #: src/sslmanager.c:142 src/sslmanager.c:150
-#, fuzzy
 msgid "_Reject"
-msgstr "Přesměrovat"
+msgstr "_Odmítnout"
 
 #: src/sslmanager.c:143 src/sslmanager.c:149
 msgid "_Temporarily accept"
-msgstr ""
+msgstr "_Dočasně přijmout"
 
 #: src/sslmanager.c:144 src/sslmanager.c:148
-#, fuzzy
 msgid "Always _accept"
-msgstr "Vždy"
+msgstr "_Trvale přijmout"
 
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
@@ -6862,92 +6856,92 @@ msgstr "Nastavování souhrnu z dat zpráv..."
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisování vyrovnávací paměti souhrnu (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je nastavena na smazání\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Smazat zprávy"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete vymazat zprávy z koše?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávání duplikovaných zpráv..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d má zrušeno označení\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je nastavena na přesun do %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je nastavena na zkopírování do %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Vytváří se vlákna..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Ruší se vlákna..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrování (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrování..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrování..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "filtrovaných zpráv %d."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Č."
 
diff --git a/po/da.po b/po/da.po
index db991760..f00ca212 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -505,12 +505,12 @@ msgstr "Fundet %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration er gemt.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Mappe"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mappe"
@@ -683,7 +683,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -820,7 +820,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresse"
@@ -834,7 +834,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
@@ -856,8 +856,8 @@ msgstr "/_Filer/Ny _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -876,21 +876,21 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
@@ -922,7 +922,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -936,12 +936,12 @@ msgstr "/_Funktioner/Importer _LDIF-Fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -959,7 +959,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -998,17 +998,17 @@ msgstr "Adressebog"
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1214,7 +1214,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Note"
 
@@ -1265,437 +1265,437 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Vedhæftet"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Emne:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1703,25 +1703,25 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1732,12 +1732,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1746,15 +1746,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1763,91 +1763,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1857,52 +1857,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2862,7 +2862,7 @@ msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3766,7 +3766,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -4004,7 +4004,7 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
@@ -6102,17 +6102,17 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Dato"
 
@@ -6122,7 +6122,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Til:"
@@ -7075,96 +7075,96 @@ msgstr "Opretter oversigt ud fra meddelelses data..."
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/de.po b/po/de.po
index 89572b8e..82f77c62 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -505,11 +505,11 @@ msgstr "Gefunden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration wurde gespeichert.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Manueller Spam-Mail Filter"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
@@ -684,7 +684,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -819,7 +819,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresse"
@@ -833,7 +833,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
@@ -854,8 +854,8 @@ msgstr "/_Datei/Neues _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -874,21 +874,21 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
@@ -920,7 +920,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -933,12 +933,12 @@ msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -956,7 +956,7 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -993,17 +993,17 @@ msgstr "Adressbuch"
 msgid "Name:"
 msgstr "Name:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1208,7 +1208,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1259,395 +1259,395 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Keine"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/In Ent_wurfablage speichern"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ansicht/_Werkzeugliste anpassen..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschlüsseln"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Anhänge"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Senden"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1655,25 +1655,25 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1701,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1723,89 +1723,89 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,48 +1814,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2794,7 +2794,7 @@ msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3662,7 +3662,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3914,7 +3914,7 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
@@ -5935,17 +5935,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -5955,7 +5955,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "An"
 
@@ -6895,92 +6895,92 @@ msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/el.po b/po/el.po
index 460c1d3f..b7c6a520 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -511,11 +511,11 @@ msgstr "Βρέθηκαν %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χειροκίνητο)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
 
@@ -696,7 +696,7 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -832,7 +832,7 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -846,7 +846,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
@@ -867,8 +867,8 @@ msgstr "/_Αρχείο/Νέο _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -887,21 +887,21 @@ msgstr "/_Αρχείο/_Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
@@ -933,7 +933,7 @@ msgstr "/_Διεύθυνση/_Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
@@ -947,12 +947,12 @@ msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
@@ -970,7 +970,7 @@ msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1007,17 +1007,17 @@ msgstr "Κατάλογος διευθύνσεων"
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
@@ -1235,7 +1235,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1287,397 +1287,397 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Κανένα"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Προσθήκη..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Διαγραφή"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Ιδιότητες..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Αρχείο/Απο_στολή"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Αρχείο/Αποστο_λή αργότερα"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Αρχείο/Αποθήκευση στον φάκελο _πρόχειρα"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Αρχείο/Αποθήκευση και _συνέχεια επεξεργασίας"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Αρχείο/Επισύνα_ψη αρχείου"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Αρχείο/Ε_ισαγωγή αρχείου"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Αρχείο/Εισαγωγή υπο_γραφής"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Αρχείο/Επισύναψη υπογ_ραφής"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Επεξεργασία/Α_ναίρεση"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Επεξεργασία/Επανά_ληψη"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Επεξεργασία/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Επεξεργασία/Απο_κοπή"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Επεξεργασία/Eπικόλληση ως πα_ράθεση"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Επεξεργασία/Επιλ_ογή όλων"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Επεξεργασία/Ανα_δίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Επεξεργασία/Αναδίπλωση μακρών _γραμμών"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αυτό_ματη αναδίπλωση"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Προβολή"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Προβολή/_Προς"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Προβολή/_Κοινοποίηση"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Προβολή/Κ_ρυφή κοινοποίηση"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Προβολή/_Απάντηση σε"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Προβολή/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Προβολή/_Συνέχεια προς"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Προβολή/_Χάρακας"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Προβολή/Σ_υνημμένου"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Προβολή/Προσαρμογή ε_ργαλειοθήκης..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ελληνικά (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Τούρκικη (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Εργαλεία/_Ευρετήριο διευθύνσεων"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Εργαλεία/_Πρότυπο"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Εργαλεία/Ε_νέργειες"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Εργαλεία/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Εργαλεία/Επεξεργασία με ε_ξωτερικό πρόγραμμα"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Εργαλεία/_Υπογραφή με PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Ε_πιλογές/_Κρυπτογράφηση με PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Συνημμένα"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,28 +1685,28 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1717,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1734,15 +1734,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1756,92 +1756,92 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1851,49 +1851,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2850,7 +2850,7 @@ msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Παραλαβή (%d μηνύματα (%s) παρελήφθησαν)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3725,7 +3725,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -3982,7 +3982,7 @@ msgstr "Συνημμένα"
 msgid "Message View - Sylpheed"
 msgstr "Προβολή μηνύματος - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν είναι δυνατή η αποθήκευση του αρχείου '%s'."
@@ -5999,17 +5999,17 @@ msgid "Attachment"
 msgstr "Συνημμένο"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6019,7 +6019,7 @@ msgid "Number"
 msgstr "Αριθμός"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Προς:"
@@ -6953,92 +6953,92 @@ msgstr "Ορισμός περίληψης από τα δεδομένα του μ
 msgid "Writing summary cache (%s)..."
 msgstr "Εγγραφή προσωρινής μνήμης περιλήψεων (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως αναγνωσμένο\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως μη αναγνωσμένο\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d είναι προς διαγραφή\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τα μηνύματα από τα απορρίμματα;"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, fuzzy, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα είναι ανεπιθύμητο"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, fuzzy, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Αποτυχία ορισμού μετακίνησης ποντικιού: %d."
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Συνέβη ένα σφάλμα κατά την επεξεργασία του μηνύματος."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Εφαρμογή φίλτρων (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "Εφαρμογή φίλτρων..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Φιλτραρίστηκαν %d μηνύματα."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Όχι."
 
diff --git a/po/es.po b/po/es.po
index 1ba3861a..4e57ab88 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -504,11 +504,11 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de correo basura (manual)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
@@ -682,7 +682,7 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -817,7 +817,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Dirección"
@@ -831,7 +831,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
@@ -852,8 +852,8 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -872,21 +872,21 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -918,7 +918,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -931,12 +931,12 @@ msgstr "/_Herramientas/Importar fichero _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -954,7 +954,7 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -991,17 +991,17 @@ msgstr "Agenda de direcciones"
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1205,7 +1205,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1256,395 +1256,395 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichero/Agregar _firma"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Recortar todas las líneas largas"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Followup-To"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/Configurar barra de _herramientas..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ver/Codificación de caract_eres/_Automática"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Cifrar con PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Herramientas/_Comprobar ortografía"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adjuntos"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,27 +1652,27 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1683,11 +1683,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1700,15 +1700,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1722,89 +1722,89 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,48 +1813,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2794,7 +2794,7 @@ msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3661,7 +3661,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3915,7 +3915,7 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -5924,17 +5924,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Fecha"
 
@@ -5944,7 +5944,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Para:"
@@ -6873,92 +6873,92 @@ msgstr "Resumiendo los mensajes..."
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
diff --git a/po/et.po b/po/et.po
index 18457a18..4d15b0fd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -508,12 +508,12 @@ msgstr "Leiti %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Häälestus on salvestatud.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Kaust"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Kaust"
@@ -687,7 +687,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -822,7 +822,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Aadress"
@@ -836,7 +836,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
@@ -858,8 +858,8 @@ msgstr "/_Fail/Uus _JPiloot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -878,21 +878,21 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
@@ -924,7 +924,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -938,12 +938,12 @@ msgstr "/_Tööriist/Impordi _LDIF fail"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -961,7 +961,7 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1000,17 +1000,17 @@ msgstr "Aadressiraamat"
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Pimekoopia:"
@@ -1221,7 +1221,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1272,438 +1272,438 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Tööriist/Käivita"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Manused"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Pealkiri:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,26 +1711,26 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1740,12 +1740,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1754,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1771,92 +1771,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1866,52 +1866,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2874,7 +2874,7 @@ msgstr "Võtan kirja (%d /%d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3771,7 +3771,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -4008,7 +4008,7 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
@@ -6108,17 +6108,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6128,7 +6128,7 @@ msgid "Number"
 msgstr "Number"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Kellele:"
@@ -7078,94 +7078,94 @@ msgstr "Teen kokkuvõtte teadete andmetest..."
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Ei."
 
diff --git a/po/fr.po b/po/fr.po
index 3520b20f..9b4249fc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -518,11 +518,11 @@ msgstr "Trouvé %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Tri (manuel) des indésirables"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
@@ -697,7 +697,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -832,7 +832,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresses"
@@ -846,7 +846,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
@@ -867,8 +867,8 @@ msgstr "/_Fichier/Nouveau carnet _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -887,21 +887,21 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
@@ -933,7 +933,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -946,12 +946,12 @@ msgstr "/_Outils/Importer un fichier _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -969,7 +969,7 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1006,17 +1006,17 @@ msgstr "Carnet d'adresses"
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Copie discrète :"
@@ -1222,7 +1222,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Information"
 
@@ -1273,397 +1273,397 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichier/_Ajouter la signature"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/_Affichage/_Faire suivre"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Outils/_Vérifier l'orthographe"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Pièces jointes"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Envoyer"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1671,25 +1671,25 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 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:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1700,11 +1700,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1739,89 +1739,89 @@ msgstr ""
 "\n"
 "Envoyer quand même?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1830,50 +1830,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2819,7 +2819,7 @@ msgstr "Récupération du message (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3696,7 +3696,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3950,7 +3950,7 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -5974,17 +5974,17 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Date"
 
@@ -5994,7 +5994,7 @@ msgid "Number"
 msgstr "Numéro"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "À :"
@@ -6928,94 +6928,94 @@ msgstr "Définition de l'index à partir des données du message..."
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "N°"
 
diff --git a/po/gl.po b/po/gl.po
index 1015ce60..0d2d6135 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -505,12 +505,12 @@ msgstr "Atopado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración gardada.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Carpeta"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Carpeta"
@@ -685,7 +685,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -820,7 +820,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Enderezo"
@@ -834,7 +834,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -856,8 +856,8 @@ msgstr "/_Ficheiro/Novo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -876,21 +876,21 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -922,7 +922,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -936,12 +936,12 @@ msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -959,7 +959,7 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -998,17 +998,17 @@ msgstr "Axenda de enderezos"
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1220,7 +1220,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1271,438 +1271,438 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adxuntos"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1710,25 +1710,25 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1739,12 +1739,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1753,15 +1753,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1770,91 +1770,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1864,52 +1864,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2870,7 +2870,7 @@ msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3770,7 +3770,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -4009,7 +4009,7 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
@@ -6106,17 +6106,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
 
@@ -6126,7 +6126,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Para:"
@@ -7075,94 +7075,94 @@ msgstr "Resumindo as mensaxes..."
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Non."
 
diff --git a/po/hr.po b/po/hr.po
index b9f819b1..bbecc697 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -511,12 +511,12 @@ msgstr "Pronađen %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Spis"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Spis"
@@ -692,7 +692,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -838,7 +838,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -861,8 +861,8 @@ msgstr "/_Datoteka/Novi _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -881,21 +881,21 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
@@ -927,7 +927,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -941,12 +941,12 @@ msgstr "/_Datoteka/Unesi _LDIF datoteku"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -964,7 +964,7 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1003,17 +1003,17 @@ msgstr "Adresar"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1218,7 +1218,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1269,311 +1269,311 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u spis _nedovršeno"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Priloži datoteku"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:578
+#: src/compose.c:582
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Sažmi _poglavlje"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:588
+#: src/compose.c:592
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:589
+#: src/compose.c:593
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/_Pregled"
 
-#: src/compose.c:590
+#: src/compose.c:594
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Poruka/P_roslijedi"
 
-#: src/compose.c:595
+#: src/compose.c:599
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:597
+#: src/compose.c:601
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:689
+#: src/compose.c:693
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
@@ -1581,136 +1581,136 @@ msgstr "/_Izvrši"
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Izvrši"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prilog"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1718,25 +1718,25 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1744,12 +1744,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1758,15 +1758,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1775,93 +1775,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1871,53 +1871,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2899,7 +2899,7 @@ msgstr "Primam poruke (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3863,7 +3863,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4105,7 +4105,7 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
@@ -6198,17 +6198,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -6218,7 +6218,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -7187,94 +7187,94 @@ msgstr "Postavljam pregled od podataka poruke..."
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Ne."
 
diff --git a/po/hu.po b/po/hu.po
index e9aa3337..4ed242d3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2007-09-19 15:18+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -505,11 +505,11 @@ msgstr "Találat %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Beállítások tárolva.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Levélszemét szűrés (kézi)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrés"
 
@@ -685,7 +685,7 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Cím"
@@ -835,7 +835,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
@@ -856,8 +856,8 @@ msgstr "/_Fájl/Új _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -876,21 +876,21 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
@@ -922,7 +922,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -935,12 +935,12 @@ msgstr "/_Eszközök/_LDIF fájl importálása"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -958,7 +958,7 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -995,17 +995,17 @@ msgstr "Címjegyzék"
 msgid "Name:"
 msgstr "Név:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Titkos másolat:"
@@ -1205,7 +1205,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1256,395 +1256,395 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Küldés"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Fájl/Kü_ldés később"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fájl/Mentés a Vázlatok mappába"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fájl/Mentés és _szerkesztésben marad"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Fájl/Aláírás _csatolása"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Szerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/_Nézet/_Válaszcím"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/_Nézet/Vá_laszcikk-cím"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Nézet/Eszközs_áv testreszabása..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Nézet/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Műveletek"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Szerkesztés/Szerkesztés _külső programmal"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/PGP _Aláírás"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Eszközök/_Helyesírásellenőrzés"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 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:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Csatolások"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Küldés"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,26 +1652,26 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő levél küldésekor."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1682,11 +1682,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1699,15 +1699,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1722,89 +1722,89 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,48 +1813,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2792,7 +2792,7 @@ msgstr "Levél letöltése (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Levelek fogadása (%d levél (%s) fogadott)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3658,7 +3658,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3912,7 +3912,7 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Levélnézet - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
@@ -5924,17 +5924,17 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Dátum"
 
@@ -5944,7 +5944,7 @@ msgid "Number"
 msgstr "Szám"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "Címzett"
 
@@ -6871,92 +6871,92 @@ msgstr "Összefoglaló beállítása a levelek adataiból..."
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d levél kijelölve\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d levél olvasottnak jelölve\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d levél olvasatlannak jelölve\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d levél törlésre kijelölve\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Levél(ek) törlése"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az levél(eke)t a kukából?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező levelek törlése..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d levél kijelölésének megszüntetése\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d levél kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d levél kijelölve a(z) %s mappába másolásra\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Szál felépítése..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Szál lebontása..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d levél szűrése megtörtént."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Db"
 
diff --git a/po/it.po b/po/it.po
index f4a37d8f..61bebada 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -505,11 +505,11 @@ msgstr "Trovato %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configurazione è stata salvata.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Filtro mail spazzatura (manuale)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
@@ -685,7 +685,7 @@ msgstr ""
 "tutti»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -820,7 +820,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Indirizzo"
@@ -834,7 +834,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
@@ -855,8 +855,8 @@ msgstr "/_File/Nuovo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -875,21 +875,21 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
@@ -921,7 +921,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -934,12 +934,12 @@ msgstr "/S_trumenti/Importa file _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -994,17 +994,17 @@ msgstr "Rubrica"
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1209,7 +1209,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1260,395 +1260,395 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_File/A_ggiungi firma"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visualizza/Per_sonalizza barra degli strumenti"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (_Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/C_ifratura PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/S_trumenti/_Controllo ortografico"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Allegati"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1656,27 +1656,27 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1688,11 +1688,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1706,15 +1706,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1728,89 +1728,89 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,48 +1819,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2801,7 +2801,7 @@ msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3670,7 +3670,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3924,7 +3924,7 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
@@ -5939,17 +5939,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
 
@@ -5959,7 +5959,7 @@ msgid "Number"
 msgstr "Numero"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "A"
 
@@ -6889,92 +6889,92 @@ msgstr "Impostazione del sommario dai dati dei messaggi..."
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
diff --git a/po/ja.po b/po/ja.po
index 409ecb0f..d8bf8c41 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -504,11 +504,11 @@ msgstr "%s が見つかりました\n"
 msgid "Configuration is saved.\n"
 msgstr "設定を保存しました。\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "迷惑メールフィルタ (手動)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
@@ -682,7 +682,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -817,7 +817,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "アドレス"
@@ -831,7 +831,7 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -852,8 +852,8 @@ msgstr "/ファイル(_F)/新規_JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -872,21 +872,21 @@ msgstr "/ファイル(_F)/削除(_D)"
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
@@ -918,7 +918,7 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -931,12 +931,12 @@ msgstr "/ツール(_T)/_LDIFファイルをインポート"
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -954,7 +954,7 @@ msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -991,17 +991,17 @@ msgstr "アドレス帳"
 msgid "Name:"
 msgstr "名前:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1203,7 +1203,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1254,392 +1254,392 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "なし"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/追加(_A)..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/ファイル(_F)/送信(_S)"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/ファイル(_F)/後で送信(_L)"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/ファイル(_F)/ファイルを添付(_A)"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/ファイル(_F)/ファイルを挿入(_I)"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/ファイル(_F)/署名を挿入(_G)"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/ファイル(_F)/署名を追加(_P)"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/編集(_E)/元に戻す(_U)"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編集(_E)/現在の段落を整形する(_W)"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/表示(_V)"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/表示(_V)/宛先(_T)"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/表示(_V)/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/表示(_V)/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/表示(_V)/返信先を指定(_Reply-To)"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/表示(_V)/フォロー先を指定(_Followup-To)"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/表示(_V)/ルーラ(_U)"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/表示(_V)/ツールバーをカスタマイズ(_S)..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/ツール(_T)/スペルチェック(_C)"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 msgid "Attachment is missing"
 msgstr "添付ファイルがありません"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr "宛先の確認"
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 msgid "Really send this mail to the following addresses?"
 msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1647,25 +1647,25 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,11 +1676,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1715,89 +1715,89 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,48 +1806,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2785,7 +2785,7 @@ msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "受信中 (%d 通 (%s) 受信)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3648,7 +3648,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3900,7 +3900,7 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
@@ -5903,17 +5903,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "日付"
 
@@ -5923,7 +5923,7 @@ msgid "Number"
 msgstr "番号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "宛先"
 
@@ -6845,92 +6845,92 @@ msgstr "メッセージデータからサマリを設定中..."
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "番号"
 
diff --git a/po/ko.po b/po/ko.po
index 478c4e7a..47bd13a4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -508,12 +508,12 @@ msgstr "%s을 발견\n"
 msgid "Configuration is saved.\n"
 msgstr "설정이 저장되었습니다.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "폴더"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "폴더"
@@ -676,7 +676,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "주소"
@@ -825,7 +825,7 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -847,8 +847,8 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -867,21 +867,21 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
@@ -913,7 +913,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -927,12 +927,12 @@ msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -950,7 +950,7 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -989,17 +989,17 @@ msgstr "주소록"
 msgid "Name:"
 msgstr "이름:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "숨은 참조:"
@@ -1204,7 +1204,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "알림"
 
@@ -1255,438 +1255,438 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "첨부"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "제목:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1694,25 +1694,25 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1722,12 +1722,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1736,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1753,92 +1753,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1848,52 +1848,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2852,7 +2852,7 @@ msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3744,7 +3744,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -3982,7 +3982,7 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
@@ -6056,17 +6056,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "날짜"
 
@@ -6076,7 +6076,7 @@ msgid "Number"
 msgstr "숫자"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "받는 사람:"
@@ -7015,94 +7015,94 @@ msgstr "메시지 데이타로부터 요약을 만듭니다..."
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "번호"
 
diff --git a/po/lt.po b/po/lt.po
index 8e0fc4ac..1a0027e0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -504,11 +504,11 @@ msgstr "Rasta %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nustatymai išsaugoti.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Nepageidautino pašto filtras (neautomatinis)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Nepageidautino pašto filtras"
 
@@ -681,7 +681,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -816,7 +816,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresai"
@@ -830,7 +830,7 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
@@ -851,8 +851,8 @@ msgstr "/_Failas/Naujas _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -871,21 +871,21 @@ msgstr "/_Failas/Išt_rinti"
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
@@ -917,7 +917,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -930,12 +930,12 @@ msgstr "/Į_rankiai/Importuoti _LDIF failą"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -953,7 +953,7 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -990,17 +990,17 @@ msgstr "Adresų knyga"
 msgid "Name:"
 msgstr "Vardas:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slapta kopija:"
@@ -1200,7 +1200,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1251,395 +1251,395 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Nieko"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Pri_dėti..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Failas/_Siųsti"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Failas/Siųsti _vėliau"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Failas/Išsaugoti _juodraštį"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Failas/Išsaugoti ir _toliau redaguoti"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Failas/Prise_gti failą"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Failas/Įt_erpti failą"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Failas/Įterpti pa_rašą"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Failas/_Pridėti parašą"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Taisa/_Atšaukti"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Taisa/Pa_kartoti"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Taisa/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisa/Iškirp_ti"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisa/Įdėti kaip _citatą"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Taisa/Žymėti _viską"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Taisa/_Laužyti pastraipą"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Taisa/Laužyti _visas ilgas eilutes"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisa/_Automatiškai laužyti"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Ro_dymas"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/Ro_dymas/_Kam"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/Ro_dymas/Ko_pija"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/Ro_dymas/_Slapta kopija"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/Ro_dymas/Kam _atsakyti"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Ro_dymas/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/Ro_dymas/_Gija"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/Ro_dymas/_Liniuotė"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/Ro_dymas/Prise_gti failai"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr ""
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Ro_dymas/Simbolių ko_duotė"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Ro_dymas/Simbolių ko_duotė/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Į_rankiai/Naudoti išorinį redaktorių"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Į_rankiai/PGP _parašas"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Į_rankiai/PGP ši_fravimas"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/Į_rankiai/_Tikrinti rašybą"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priedai"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1647,25 +1647,25 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,11 +1676,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1710,89 +1710,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1801,48 +1801,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2780,7 +2780,7 @@ msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gauti laiškai: %d (%s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3644,7 +3644,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3897,7 +3897,7 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
@@ -5899,17 +5899,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
 
@@ -5919,7 +5919,7 @@ msgid "Number"
 msgstr "Numeris"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Kam:"
@@ -6839,92 +6839,92 @@ msgstr "Nustatoma santrauka iš laiško duomenų..."
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti laiškus iš šiukšlinės?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Laiškas %d pažymėtas perkėlimui į %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/nl.po b/po/nl.po
index ea153e04..60f48dc0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -510,12 +510,12 @@ msgstr "%s gevonden\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuratie is opgeslagen.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Troepfilter"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Troepfilter"
 
@@ -691,7 +691,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -826,7 +826,7 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adres"
@@ -840,7 +840,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
@@ -861,8 +861,8 @@ msgstr "/_Bestand/Nieuwe _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -881,21 +881,21 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
@@ -927,7 +927,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -941,12 +941,12 @@ msgstr "/_Gereedschap/_LDIF bestand importeren"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -964,7 +964,7 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1003,17 +1003,17 @@ msgstr "Adresboek"
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1222,7 +1222,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1273,399 +1273,399 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Bericht/_Verzenden"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Bericht/_Later verzenden"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Bericht/Klad _opslaan"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Bericht/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bestand _invoegen"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening invoegen"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Bericht/Handtekening _toevoegen"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/Be_werken/_Ongedaan maken"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/Be_werken/O_pnieuw toepassen"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Be_werken/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/Be_werken/K_nippen"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Be_werken/Plakken als _citaat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Be_werken/_Alles selecteren"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Be_werken/Regelterugloop in hele bericht"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Be_werken/Regel_terugloop"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Beel_d"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/Beel_d/_Aan"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/Beel_d/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/Beel_d/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/Beel_d/Ant_woord naar"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Beel_d/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/Beel_d/_Lineaal"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/Beel_d/_Bijlage"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Beel_d/_Tekstcodering"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Beel_d/_Tekstcodering/_Automatisch"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Beel_d/_Tekstcodering/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Beel_d/_Tekstcodering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Beel_d/_Tekstcodering/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Beel_d/_Tekstcodering/Centraaleuropees (ISO-8859-2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Beel_d/_Tekstcodering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Beel_d/_Tekstcodering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Beel_d/_Tekstcodering/Thais (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Beel_d/_Tekstcodering/Thais (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Gereedschap/Be_werken met externe editor"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/_Ondertekenen met PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/_Coderen met PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Gereedschap/_Spellingscontrole"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal instellen"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bijlagen"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1673,25 +1673,25 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1702,11 +1702,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1719,15 +1719,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1736,89 +1736,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1827,48 +1827,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2823,7 +2823,7 @@ msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ophalen (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3698,7 +3698,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3959,7 +3959,7 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
@@ -5989,17 +5989,17 @@ msgid "Attachment"
 msgstr "Bijlage"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -6009,7 +6009,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Aan:"
@@ -6946,93 +6946,93 @@ msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/pl.po b/po/pl.po
index f6f28d02..e6a88ae9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -499,12 +499,12 @@ msgstr "Znaleziono: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracja zapisana.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Niechciana poczta"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Niechciana poczta"
@@ -680,7 +680,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -816,7 +816,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adres"
@@ -830,7 +830,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
@@ -852,8 +852,8 @@ msgstr "/_Plik/Nowy _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -872,21 +872,21 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
@@ -918,7 +918,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -932,12 +932,12 @@ msgstr "/_Plik/Importuj plik _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -955,7 +955,7 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -994,17 +994,17 @@ msgstr "Książka adresowa"
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
@@ -1217,7 +1217,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1268,405 +1268,405 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Plik/Wyślij"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Plik/Wyś_lij później"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Plik/Zapisz w katalogu _szablonów"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Plik/Zapisz i kontynuuj _edycję"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Załączniki"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatyczne ustawianie następujących adresów"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Wyślij"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,26 +1674,26 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1703,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, 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:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1734,89 +1734,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,51 +1826,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -2826,7 +2826,7 @@ msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3697,7 +3697,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3932,7 +3932,7 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
@@ -5990,17 +5990,17 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
 
@@ -6010,7 +6010,7 @@ msgid "Number"
 msgstr "Numer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Do:"
@@ -6976,92 +6976,92 @@ msgstr "Ustawianie podsumowania z danych wiadomości..."
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nr"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2485b5ed..28bbf65c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
-"PO-Revision-Date: 2007-07-20 09:44-0300\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
+"PO-Revision-Date: 2008-04-25 09:30-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -512,11 +512,11 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de spam (manual)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
@@ -689,7 +689,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Endereço"
@@ -838,7 +838,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -859,8 +859,8 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -879,21 +879,21 @@ msgstr "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
@@ -925,7 +925,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -938,12 +938,12 @@ msgstr "/_Ferramentas/Importar arquivo _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
@@ -961,7 +961,7 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -998,17 +998,17 @@ msgstr "Catálogo de endereços"
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Cco:"
@@ -1213,7 +1213,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1264,395 +1264,392 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Enviar"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Arquivo/Enviar _depois"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arquivo/Salvar na pasta de _rascunhos"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arquivo/Salvar e _continuar editando"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Arquivo/Apender as_sinatura"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as _linhas compridas"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Cco"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/E_xibir/_Reply-To"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/E_xibir/_Followup-To"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/E_xibir/Cu_stomizar barra de ferramentas..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação de caracteres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação de caracteres/Arábico (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação de caracteres/Arábico (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Ferramentas/Editar com editor e_xterno"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Assinar (PGP)"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Ferramentas/_Encriptar (PGP)"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/_Verificar ortografia"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 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:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2913
-#, fuzzy
+#: src/compose.c:2917
 msgid "Attachment is missing"
-msgstr "Anexos"
+msgstr "Anexo ausente"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
-msgstr ""
+msgstr "Não há anexos. Enviar sem anexos?"
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
-msgstr ""
+msgstr "Conferir destinatários"
 
-#: src/compose.c:3077
-#, fuzzy
+#: src/compose.c:3081
 msgid "Really send this mail to the following addresses?"
-msgstr "Estabelecer os seguintes endereços automaticamente"
+msgstr "Deseja realmente enviar este e-mail para os seguintes destinatários?"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:3205
-#, fuzzy
+#: src/compose.c:3209
 msgid "_Send"
-msgstr "Enviar"
+msgstr "_Enviar"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1660,25 +1657,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:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 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:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1690,11 +1687,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1707,15 +1704,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1729,89 +1726,89 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1820,48 +1817,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2804,7 +2801,7 @@ msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3139,9 +3136,8 @@ msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/_Procurar mensagens..."
 
 #: src/mainwindow.c:569
-#, fuzzy
 msgid "/_Edit/_Quick search"
-msgstr "/_Editar/Co_lar"
+msgstr "/_Editar/Busca _rápida"
 
 #: src/mainwindow.c:572
 msgid "/_View/Show or hi_de"
@@ -3669,7 +3665,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3923,7 +3919,7 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
@@ -4735,18 +4731,20 @@ msgid ""
 "Notify for missing attachments when the following strings (comma-separated) "
 "are found in the message body"
 msgstr ""
+"Confirmar anexos quando as seguintes palavras (separadas por vírgula) forem "
+"encontradas no corpo da mensagem"
 
 #: src/prefs_common_dialog.c:984
 msgid "(Ex: attach)"
-msgstr ""
+msgstr "(Ex: anexo)"
 
 #: src/prefs_common_dialog.c:995
 msgid "Confirm recipients before sending"
-msgstr ""
+msgstr "Confirmar destinatários antes de enviar"
 
 #: src/prefs_common_dialog.c:1001
 msgid "Excluded addresses/domains (comma-separated):"
-msgstr ""
+msgstr "Domínios/endereços excluídos (separados por vírgula):"
 
 #: src/prefs_common_dialog.c:1080 src/prefs_common_dialog.c:1469
 #: src/prefs_folder_item.c:139
@@ -5932,17 +5930,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
 
@@ -5952,7 +5950,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "Para"
 
@@ -6214,19 +6212,17 @@ msgid "_Save as search folder"
 msgstr "_Salvar como pasta de busca"
 
 #: src/query_search.c:547
-#, fuzzy
 msgid "Message not found."
-msgstr "%d mensagens encontradas.\n"
+msgstr "Mensagem não encontrada."
 
 #: src/query_search.c:549
-#, fuzzy
 msgid "1 message found."
-msgstr "%d mensagens encontradas.\n"
+msgstr "1 mensagem encontrada."
 
 #: src/query_search.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "%d messages found."
-msgstr "%d mensagens encontradas.\n"
+msgstr "%d mensagens encontradas."
 
 #: src/query_search.c:579
 #, c-format
@@ -6438,14 +6434,13 @@ msgstr ""
 "%s"
 
 #: src/send_message.c:954
-#, fuzzy
 msgid "Can't connect to SMTP server."
-msgstr "Não foi possível se conectar com o servidor NNTP: %s:%d\n"
+msgstr "Não foi possível conectar ao SMTP."
 
 #: src/send_message.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to SMTP server: %s:%d"
-msgstr "Não foi possível se conectar com o servidor NNTP: %s:%d\n"
+msgstr "Não foi possível conectar ao servidor SMTP: %s:%d"
 
 #: src/setup.c:43
 msgid "Mailbox setting"
@@ -6877,92 +6872,92 @@ msgstr "Configurando resumo a partir dos dados das mensgens..."
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nº"
 
diff --git a/po/ro.po b/po/ro.po
index 55429a6f..d575f43d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
-"PO-Revision-Date: 2008-03-21 00:52+0200\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
+"PO-Revision-Date: 2008-04-26 13:19+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: Romania\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,139,414,422\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,1020,139,414,422\n"
 
 #: libsylph/account.c:56
 msgid "Reading all config for each account...\n"
@@ -94,17 +94,17 @@ msgstr "folderul root %s nu există\n"
 
 #: libsylph/imap.c:1946 libsylph/imap.c:1954
 msgid "error occurred while getting LIST.\n"
-msgstr "a apărut o eroare în timpul obțineriii 'LIST'.\n"
+msgstr "a apărut o eroare în timpul obțineriii „LIST”.\n"
 
 #: libsylph/imap.c:2109
 #, c-format
 msgid "Can't create '%s'\n"
-msgstr "Nu se poate crea '%s'\n"
+msgstr "Nu se poate crea „%s”\n"
 
 #: libsylph/imap.c:2114
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
-msgstr "Nu se poate crea '%s' în INBOX\n"
+msgstr "Nu se poate crea „%s” în INBOX\n"
 
 #: libsylph/imap.c:2176
 msgid "can't create mailbox: LIST failed\n"
@@ -126,7 +126,7 @@ msgstr "nu se poate șterge căsuța poștală\n"
 # hm ? envelope conform wikipedia
 #: libsylph/imap.c:2451
 msgid "can't get envelope\n"
-msgstr "nu se poate obține 'envelope' (informația de routing)\n"
+msgstr "nu se poate obține „envelope” (informația de routing)\n"
 
 #: libsylph/imap.c:2464
 #, c-format
@@ -137,13 +137,13 @@ msgstr "Obținere anteturi mesaje (%d / %d)"
 #: libsylph/imap.c:2474
 msgid "error occurred while getting envelope.\n"
 msgstr ""
-"a apărut o eroare în timpul obținerii 'envelope' (informația de routing).\n"
+"a apărut o eroare în timpul obținerii „envelope” (informația de routing).\n"
 
 # hm ? envelope conform wikipedia
 #: libsylph/imap.c:2496
 #, c-format
 msgid "can't parse envelope: %s\n"
-msgstr "'envelope' (informația de routing) nu poate fi analizată: %s\n"
+msgstr "„envelope” (informația de routing) nu poate fi analizată: %s\n"
 
 #: libsylph/imap.c:2620
 #, c-format
@@ -253,7 +253,7 @@ msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
-"a fost găsit câmp From 'unescaped':\n"
+"a fost găsit câmp From „unescaped”:\n"
 "%s"
 
 #: libsylph/mbox.c:273
@@ -264,11 +264,11 @@ msgstr "%d mesaje găsite.\n"
 #: libsylph/mbox.c:291
 #, c-format
 msgid "can't create lock file %s\n"
-msgstr "nu se poate crea fișierul 'lock' %s\n"
+msgstr "nu se poate crea fișierul „lock” %s\n"
 
 #: libsylph/mbox.c:292
 msgid "use 'flock' instead of 'file' if possible.\n"
-msgstr "dacă este posibil, folosiți 'flock' în loc de 'file'.\n"
+msgstr "dacă este posibil, folosiți „flock” în loc de „file”.\n"
 
 #: libsylph/mbox.c:304
 #, c-format
@@ -326,7 +326,7 @@ msgid ""
 "File `%s' already exists.\n"
 "Can't create folder."
 msgstr ""
-"Fișierul '%s' există deja.\n"
+"Fișierul „%s” există deja.\n"
 "Nu se poate crea folderul."
 
 #: libsylph/mh.c:1538
@@ -341,7 +341,7 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 "Numele directorului\n"
-"'%s' nu este un șir valid UTF-8.\n"
+"„%s” nu este un șir valid UTF-8.\n"
 "Poate codarea specificată în locale este folosită pentru numele de fișier.\n"
 "Dacă acela este cazul, va trebui să setați următoarea variabilă de mediu\n"
 "(vedeți README pentru detalii):\n"
@@ -407,7 +407,7 @@ msgstr "nu se poate obține xover\n"
 
 #: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
-msgstr "a apărut o eroare în timpul obținerii 'xover'.\n"
+msgstr "a apărut o eroare în timpul obținerii „xover”.\n"
 
 #: libsylph/news.c:844
 #, c-format
@@ -420,7 +420,7 @@ msgstr "nu se poate obține xhdr\n"
 
 #: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
-msgstr "a apărut o eroare în timpul obținerii 'xhdr'.\n"
+msgstr "a apărut o eroare în timpul obținerii „xhdr”.\n"
 
 #: libsylph/nntp.c:68
 #, c-format
@@ -514,11 +514,11 @@ msgstr "Găsit %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configurația a fost salvată.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Filtru mesaj spam (manual)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Filtru mesaj spam"
 
@@ -538,7 +538,7 @@ msgstr "nu se poate prelua mesajul %d\n"
 #: libsylph/procmsg.c:1372
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
-msgstr "Linia de comandă pentru tipărire nu este validă: '%s'\n"
+msgstr "Linia de comandă pentru tipărire nu este validă: „%s”\n"
 
 #: libsylph/recv.c:141
 msgid "error occurred while retrieving data.\n"
@@ -690,11 +690,11 @@ msgid ""
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
 "Mesajele noi vor fi verificate în această ordine. Bifați căsuțele din "
-"coloana 'G'\n"
-"pentru a activa recepționarea mesajelor la comanda 'Verifică tot'."
+"coloana „G”\n"
+"pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -721,7 +721,7 @@ msgstr " _Stabilește ca și cont implicit"
 #: src/account_dialog.c:489
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "Chiar vreți să ștergeți contul '%s'?"
+msgstr "Chiar vreți să ștergeți contul „%s” ?"
 
 #: src/account_dialog.c:491 src/prefs_filter.c:687
 msgid "(Untitled)"
@@ -760,7 +760,7 @@ msgid ""
 "Command could not be started. Pipe creation failed.\n"
 "%s"
 msgstr ""
-"Comanda nu a putut fi pornită. Crearea 'pipe' a eșuat.\n"
+"Comanda nu a putut fi pornită. Crearea „pipe” a eșuat.\n"
 "%s"
 
 # hm ? sau:
@@ -809,7 +809,7 @@ msgid ""
 "  %s"
 msgstr ""
 "Introduceți argumentul pentru următoarea acțiune:\n"
-"('%%h' va fi înlocuit de argument)\n"
+"(„%%h” va fi înlocuit de argument)\n"
 "  %s"
 
 # hm ?
@@ -825,7 +825,7 @@ msgid ""
 "  %s"
 msgstr ""
 "Introduceți argumentul pentru următoarea acțiune:\n"
-"('%%u' va fi înlocuit de argument)\n"
+"(„%%u” va fi înlocuit de argument)\n"
 "  %s"
 
 # hm ?
@@ -838,7 +838,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # (în meniu la compunere)
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Agendă"
@@ -852,7 +852,7 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați folderul pentru agendă"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
@@ -873,8 +873,8 @@ msgstr "/_Fișier/_JPilot nou"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -893,22 +893,22 @@ msgstr "/_Fișier/Ș_terge"
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # obs: comun și în main menu și în rmb agendă
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
@@ -940,7 +940,7 @@ msgstr "/A_dresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
@@ -953,12 +953,12 @@ msgstr "/_Unelte/Importă fișier _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă fișier _CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
@@ -976,7 +976,7 @@ msgid "/New _Folder"
 msgstr "/_Folder nou"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1014,17 +1014,17 @@ msgstr "Agendă"
 msgid "Name:"
 msgstr " Nume:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1059,7 +1059,7 @@ msgstr "Ștergere adresă (adrese)"
 
 #: src/addressbook.c:882
 msgid "Really delete the address(es)?"
-msgstr "Chiar doriți să ștergeți adresa (adresele) ?"
+msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
 #: src/addressbook.c:1657
 #, c-format
@@ -1067,7 +1067,7 @@ msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
 "If deleting the folder only, addresses will be moved into parent folder."
 msgstr ""
-"Vreți să ștergeți folderul ȘI toate adresele din '%s' ?\n"
+"Vreți să ștergeți folderul ȘI toate adresele din „%s” ?\n"
 "Dacă ștergeți doar folderul, adresele vor fi mutate în folderul părinte."
 
 #: src/addressbook.c:1660 src/folderview.c:2491
@@ -1085,7 +1085,7 @@ msgstr "Folder și _adrese"
 #: src/addressbook.c:1665
 #, c-format
 msgid "Really delete `%s' ?"
-msgstr "Chiar doriți să ștergeți '%s' ?"
+msgstr "Sigur doriți să ștergeți „%s” ?"
 
 #: src/addressbook.c:2442 src/addressbook.c:2575
 msgid "New user, could not save index file."
@@ -1228,7 +1228,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1281,400 +1281,397 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Adăugă..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/Ște_rge"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Proprietăți..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Fișier/_Trimite"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Fișier/Trimite _mai târziu"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fișier/Salvează în folderul _ciorne"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fișier/_Salvează și continuă editarea"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Fișier/_Atașează un fișier"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Fișier/_Inserează un fișier"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fișier/Inserea_ză semnătura"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Fișier/Adau_gă semnătura"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulează"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Refă"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Taie"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/_Lipește ca citat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Selecte_ază tot"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editare/_Desparte paragraful curent"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Desparte _liniile lungi"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/Desparte liniile aut_omat"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Vizualizare"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Vizualizare/Că_tre"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Vizualizare/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Vizualizare/_Bcc"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/_Vizualizare/_Răspuns către"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
 # hm ?
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/_Vizualizare/_Urmărește"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Vizualizare/Ri_glă"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Vizualizare/_Atașament"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
-msgstr "/_Vizualizare/Personalizează bara de _unelte..."
+msgstr "/_Vizualizare/Personali_zează bara de unelte..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Vizualizare/Codare caract_ere"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Vizualizare/Codare caract_ere/_Automat"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/Codare caract_ere/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vizualizare/Codare caract_ere/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vizualizare/Codare caract_ere/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vizualizare/Codare caract_ere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vizualizare/Codare caract_ere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/Codare caract_ere/Greek (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/Codare caract_ere/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinses (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Șablon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acțiu_ni"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Unelte/Editare cu editor e_xtern"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Unelte/Semnează P_GP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Unelte/Cr_iptează PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Unelte/Verifi_că ortografia"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Eroare de format al mesajului de răspuns sau înaintat."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Trimiteți mesajul oricum ?"
 
-#: src/compose.c:2913
-#, fuzzy
+#: src/compose.c:2917
 msgid "Attachment is missing"
-msgstr "Atașamente"
+msgstr "Lipsă atașament"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
-msgstr ""
+msgstr "Nu este atașat niciun fișier. Trimiteți fără atașamente ?"
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
-msgstr ""
+msgstr "Confirmare destinatari"
 
-#: src/compose.c:3077
-#, fuzzy
+#: src/compose.c:3081
 msgid "Really send this mail to the following addresses?"
-msgstr "Completare automată a următoarelor câmpuri de adrese"
+msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Subiect:"
 
-# obs: comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/compose.c:3205
-#, fuzzy
+# butonul de la confirmarea cui se trimite
+#: src/compose.c:3209
 msgid "_Send"
-msgstr "Trimite"
+msgstr "_Trimite"
 
 # hm ?
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1682,26 +1679,26 @@ msgstr ""
 "Contul pentru trimitere de mesaje nu este specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! depinde de traducerea lui Outbox !!!
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
-msgstr "Nu se poate salva mesajul în 'Trimise'."
+msgstr "Nu se poate salva mesajul în „Trimise”."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
-msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate '%s'."
+msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate „%s”."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1713,11 +1710,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1730,15 +1727,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1752,89 +1749,89 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
-msgstr "Linia de comandă pentru editor extern nu este validă: '%s'\n"
+msgstr "Linia de comandă pentru editor extern nu este validă: „%s”\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1843,49 +1840,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
-msgstr "Vreți să aplicați șablonul '%s' ?"
+msgstr "Vreți să aplicați șablonul „%s” ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2246,18 +2243,18 @@ msgstr "Folder nou"
 #: src/foldersel.c:556 src/folderview.c:2250 src/folderview.c:2311
 #, c-format
 msgid "`%c' can't be included in folder name."
-msgstr "'%c' nu poate fi inclus în numele folderului."
+msgstr "„%c” nu poate fi inclus în numele folderului."
 
 #: src/foldersel.c:566 src/folderview.c:2260 src/folderview.c:2319
 #: src/query_search.c:1052
 #, c-format
 msgid "The folder `%s' already exists."
-msgstr "Folderul '%s' există deja."
+msgstr "Folderul „%s” există deja."
 
 #: src/foldersel.c:574 src/folderview.c:2267
 #, c-format
 msgid "Can't create the folder `%s'."
-msgstr "Folderul '%s' nu a putut fi creat."
+msgstr "Folderul „%s” nu a putut fi creat."
 
 #: src/folderview.c:247 src/folderview.c:269
 msgid "/Create _new folder..."
@@ -2383,13 +2380,13 @@ msgstr "Este selectat folderul %s\n"
 #: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
-msgstr "Descărcare mesaje în %s..."
+msgstr "Descărcare mesaje în %s ..."
 
 # hm ?
 #: src/folderview.c:2102
 #, c-format
 msgid "Download all messages under '%s' ?"
-msgstr "Descărcați toate mesajele din '%s' ?"
+msgstr "Descărcați toate mesajele din „%s” ?"
 
 #: src/folderview.c:2105
 msgid "Download all messages"
@@ -2398,7 +2395,7 @@ msgstr "Descarcă toate mesajele"
 #: src/folderview.c:2154
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
-msgstr "A apărut o eroare în timpul descărcării mesajelor în '%s'."
+msgstr "A apărut o eroare în timpul descărcării mesajelor în „%s”."
 
 #: src/folderview.c:2235
 msgid ""
@@ -2408,12 +2405,12 @@ msgid ""
 msgstr ""
 "Introduceți numele noului folder:\n"
 "(dacă vreți să creați un folder care să conțină subfoldere,\n"
-" adăugați '/' la sfârșitul numelui)"
+" adăugați „/” la sfârșitul numelui)"
 
 #: src/folderview.c:2299
 #, c-format
 msgid "Input new name for `%s':"
-msgstr "Introduceți noul nume pentru '%s':"
+msgstr "Introduceți noul nume pentru „%s”:"
 
 #: src/folderview.c:2300
 msgid "Rename folder"
@@ -2422,12 +2419,12 @@ msgstr "Redenumește folderul"
 #: src/folderview.c:2331 src/folderview.c:2339
 #, c-format
 msgid "Can't rename the folder '%s'."
-msgstr "Nu se poate redenumi folderul '%s'"
+msgstr "Nu se poate redenumi folderul „%s”."
 
 #: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
-msgstr "Nu se poate muta folderul '%s'"
+msgstr "Nu se poate muta folderul „%s”."
 
 #: src/folderview.c:2481
 #, c-format
@@ -2435,7 +2432,7 @@ msgid ""
 "Delete the search folder '%s' ?\n"
 "The real messages are not deleted."
 msgstr ""
-"Ștergeți folderul de căutare '%s' ?\n"
+"Ștergeți folderul de căutare „%s” ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
 #: src/folderview.c:2483
@@ -2450,7 +2447,7 @@ msgid ""
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Toate folderele și mesajele din '%s' vor fi șterse permanent.\n"
+"Toate folderele și mesajele din „%s” vor fi șterse permanent.\n"
 "Recuperarea nu va fi posibilă.\n"
 "\n"
 "Chiar vreți să ștergeți ?"
@@ -2458,7 +2455,7 @@ msgstr ""
 #: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "Nu se poate șterge folderul '%s'."
+msgstr "Nu se poate șterge folderul „%s”."
 
 #: src/folderview.c:2562
 msgid "Empty trash"
@@ -2474,7 +2471,7 @@ msgid ""
 "Really remove the mailbox `%s' ?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
-"Chiar doriți să eliminați căsuța poștală '%s' ?\n"
+"Sigur doriți să eliminați căsuța poștală „%s” ?\n"
 "(Mesajele NU sunt șterse de pe disc)"
 
 #: src/folderview.c:2606
@@ -2484,7 +2481,7 @@ msgstr "Ștergere căsuță poștală"
 #: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
-msgstr "Chiar doriți să ștergeți contul IMAP4 '%s' ?"
+msgstr "Sigur doriți să ștergeți contul IMAP4 „%s” ?"
 
 #: src/folderview.c:2657
 msgid "Delete IMAP4 account"
@@ -2493,7 +2490,7 @@ msgstr "Ștergere cont IMAP4"
 #: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
-msgstr "Chiar doriți să ștergeți grupul de știri '%s' ?"
+msgstr "Sigur doriți să ștergeți grupul de știri „%s” ?"
 
 #: src/folderview.c:2811
 msgid "Delete newsgroup"
@@ -2502,7 +2499,7 @@ msgstr "Ștergere grup de știri"
 #: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
-msgstr "Chiar doriți să ștergeți contul de știri '%s' ?"
+msgstr "Sigur doriți să ștergeți contul de știri „%s” ?"
 
 #: src/folderview.c:2862
 msgid "Delete news account"
@@ -2520,10 +2517,9 @@ msgstr "Creare vizualizare antet...\n"
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
-# hm ?
 #: src/imageview.c:55
 msgid "Creating image view...\n"
-msgstr "Creare vedere imagine...\n"
+msgstr "Creare vizualizare imagine...\n"
 
 #: src/imageview.c:109
 msgid "Can't load the image."
@@ -2836,7 +2832,7 @@ msgstr "Recepționare mesaje (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recepționare (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3045,7 +3041,7 @@ msgstr ""
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Există cel puțin un mesaj în curs de compunere.\n"
-"Chiar doriți să ieșiți ?"
+"Sigur doriți să ieșiți ?"
 
 #: src/main.c:754
 msgid "Queued messages"
@@ -3178,9 +3174,8 @@ msgid "/_Edit/_Search messages..."
 msgstr "/_Editare/Caută în me_saje..."
 
 #: src/mainwindow.c:569
-#, fuzzy
 msgid "/_Edit/_Quick search"
-msgstr "/_Editare/Li_pește"
+msgstr "/_Editare/Căutare _rapidă"
 
 #: src/mainwindow.c:572
 msgid "/_View/Show or hi_de"
@@ -3229,7 +3224,7 @@ msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _stare"
 
 #: src/mainwindow.c:593
 msgid "/_View/_Customize toolbar..."
-msgstr "/_Vizualizare/Personali_zare bară de unelte..."
+msgstr "/_Vizualizare/Personali_zează bara de unelte..."
 
 #: src/mainwindow.c:595
 msgid "/_View/Layou_t"
@@ -3333,7 +3328,7 @@ msgstr "/_Vizualizare/_Pliază firul discuțiilor"
 
 #: src/mainwindow.c:625
 msgid "/_View/Set display _item..."
-msgstr "/_Vizualizare/Alegere elemente af_ișate ale sumarului..."
+msgstr "/_Vizualizare/Alege elementele af_ișate ale sumarului..."
 
 #: src/mainwindow.c:628
 msgid "/_View/_Go to"
@@ -3712,7 +3707,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3758,7 +3753,7 @@ msgstr ""
 #: src/mainwindow.c:1768 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
-msgstr "Căsuța poștală '%s' există deja."
+msgstr "Căsuța poștală „%s” există deja."
 
 #: src/mainwindow.c:1773 src/setup.c:56
 msgid "Mailbox"
@@ -3952,10 +3947,9 @@ msgstr "Căutare terminată"
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Unelte/Adaugă expeditorul în _agendă"
 
-# hm ?
 #: src/messageview.c:316
 msgid "Creating message view...\n"
-msgstr "Creare vedere mesaj...\n"
+msgstr "Creare vizualizare mesaj...\n"
 
 #: src/messageview.c:341
 msgid "Text"
@@ -3969,10 +3963,10 @@ msgstr "Atașamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
-msgstr "Nu se poate salva fișierul '%s'."
+msgstr "Nu se poate salva fișierul „%s”."
 
 #: src/mimeview.c:135
 msgid "/_Open"
@@ -4018,10 +4012,9 @@ msgstr "/_Răspunde/_listei de discuții"
 msgid "/_Check signature"
 msgstr "/_Verifică semnătura"
 
-# hm ?
 #: src/mimeview.c:180
 msgid "Creating MIME view...\n"
-msgstr "Creare vedere MIME...\n"
+msgstr "Creare vizualizare MIME...\n"
 
 #: src/mimeview.c:209
 msgid "MIME Type"
@@ -4080,7 +4073,7 @@ msgid ""
 "(`%s' will be replaced with file name)"
 msgstr ""
 "Intrați în linia de comandă pentru a deschide fișierul:\n"
-"('%s' va fi înlocuit cu numele fișierului)"
+"(„%s” va fi înlocuit cu numele fișierului)"
 
 #: src/mimeview.c:1211
 msgid "Opening executable file"
@@ -4320,12 +4313,12 @@ msgstr "Număr maxim de articole pentru descărcare"
 
 #: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
-msgstr "Fără limită dacă este specificat 0"
+msgstr "Fără limită dacă este specificat 0."
 
 #: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
-"'Verifică tot' verifică pentru eventuale mesaje noi (și) pentru acest cont"
+"„Verifică tot” verifică pentru eventuale mesaje noi (și) pentru acest cont"
 
 #: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
@@ -4333,11 +4326,11 @@ msgstr "Antet"
 
 #: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
-msgstr "Adaugă câmpul 'Date' la antet"
+msgstr "Adaugă câmpul „Date” la antet"
 
 #: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
-msgstr "Generează câmpul 'Message-ID'"
+msgstr "Generează câmpul „Message-ID”"
 
 #: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
@@ -4648,7 +4641,7 @@ msgstr "Nu este stabilit numele meniului."
 
 #: src/prefs_actions.c:474
 msgid "Colon ':' is not allowed in the menu name."
-msgstr "În numele meniului nu sunt permise două puncte ':'."
+msgstr "În numele meniului nu sunt permise două puncte „:”."
 
 #: src/prefs_actions.c:484
 msgid "Menu name is too long."
@@ -4735,7 +4728,7 @@ msgstr "Comandă"
 #: src/prefs_common_dialog.c:824
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
-msgstr "'%d' va fi înlocuit cu numărul noilor mesaje"
+msgstr "„%d” va fi înlocuit cu numărul noilor mesaje."
 
 # hm ?
 #: src/prefs_common_dialog.c:828
@@ -4753,7 +4746,7 @@ msgstr "Cale spool"
 # !!! depinde de traducerea lui Outbox !!!
 #: src/prefs_common_dialog.c:903
 msgid "Save sent messages to outbox"
-msgstr "Salvează mesajele trimise în folderul 'Trimise'"
+msgstr "Salvează mesajele trimise în folderul „Trimise”"
 
 #: src/prefs_common_dialog.c:905
 msgid "Apply filter rules to sent messages"
@@ -4768,7 +4761,7 @@ msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
-"Specifică 'Content-Transfer-Encoding'-ul folosit atunci când corpul "
+"Specifică „Content-Transfer-Encoding”-ul folosit atunci când corpul "
 "mesajului conține caractere non-ASCII."
 
 #: src/prefs_common_dialog.c:942
@@ -4795,18 +4788,20 @@ msgid ""
 "Notify for missing attachments when the following strings (comma-separated) "
 "are found in the message body"
 msgstr ""
+"Notifică despre lipsa atașamentelor atunci când următoarele șiruri (separate "
+"prin virgulă) sunt găsite în corpul mesajului:"
 
 #: src/prefs_common_dialog.c:984
 msgid "(Ex: attach)"
-msgstr ""
+msgstr "(De ex.: attach)"
 
 #: src/prefs_common_dialog.c:995
 msgid "Confirm recipients before sending"
-msgstr ""
+msgstr "Cere confirmarea destinatarilor înainte de a trimite"
 
 #: src/prefs_common_dialog.c:1001
 msgid "Excluded addresses/domains (comma-separated):"
-msgstr ""
+msgstr "Adrese/domenii excluse (separate prin virgulă):"
 
 #: src/prefs_common_dialog.c:1080 src/prefs_common_dialog.c:1469
 #: src/prefs_folder_item.c:139
@@ -4946,7 +4941,7 @@ msgstr "Vizualizare sumară"
 #: src/prefs_common_dialog.c:1538
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
-"Afișează destinatarul în coloana 'Expeditor', dacă expeditorul sunteți "
+"Afișează destinatarul în coloana „Expeditor”, dacă expeditorul sunteți "
 "dumneavoastră"
 
 #: src/prefs_common_dialog.c:1540
@@ -4985,7 +4980,7 @@ msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
-"Dacă este selectat 'Automat', se va utiliza codarea optimă pentru localele "
+"Dacă este selectat „Automat”, se va utiliza codarea optimă pentru localele "
 "curente."
 
 #: src/prefs_common_dialog.c:1681
@@ -5131,7 +5126,7 @@ msgstr "minut(e)"
 #: src/prefs_common_dialog.c:2107
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
-"Selectarea valorii '0' determină memorarea frazei secrete pentru întreaga "
+"Selectarea valorii „0” determină memorarea frazei secrete pentru întreaga "
 "sesiune."
 
 # hm ?
@@ -5162,11 +5157,11 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:2209
 msgid "Open inbox after receiving new mail"
-msgstr "Deschide folderul 'Primite' (Inbox) după primirea de mesaje noi"
+msgstr "Deschide folderul „Primite (Inbox)” după primirea de mesaje noi"
 
 #: src/prefs_common_dialog.c:2211
 msgid "Open inbox on startup"
-msgstr "Deschide folderul 'Primite' (Inbox) la pornirea programului"
+msgstr "Deschide folderul „Primite (Inbox)” la pornirea programului"
 
 #: src/prefs_common_dialog.c:2219
 msgid "Execute immediately when moving or deleting messages"
@@ -5234,7 +5229,7 @@ msgstr "Închide dialogul de primire la terminarea operației"
 
 #: src/prefs_common_dialog.c:2362
 msgid "Add address to destination when double-clicked"
-msgstr "Adaugă adresa la câmpul 'Către' atunci când se face dublu clic pe ea"
+msgstr "Adaugă adresa la câmpul „Către” atunci când se face dublu clic pe ea"
 
 #: src/prefs_common_dialog.c:2364
 msgid "On exit"
@@ -5724,7 +5719,7 @@ msgstr "Activat"
 #: src/prefs_filter.c:686
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
-msgstr "Chiar vreți să ștergeți regula '%s' ?"
+msgstr "Chiar vreți să ștergeți regula „%s” ?"
 
 #: src/prefs_filter.c:688
 msgid "Delete rule"
@@ -6005,17 +6000,17 @@ msgid "Attachment"
 msgstr "Atașament"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Dată"
 
@@ -6025,7 +6020,7 @@ msgid "Number"
 msgstr "Număr"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "Către"
 
@@ -6277,7 +6272,7 @@ msgid ""
 "`%s'"
 msgstr ""
 "Linia de comandă pentru tipărire nu este validă:\n"
-"'%s'"
+"„%s”"
 
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
@@ -6292,19 +6287,17 @@ msgid "_Save as search folder"
 msgstr "_Salvează ca folder de căutare"
 
 #: src/query_search.c:547
-#, fuzzy
 msgid "Message not found."
-msgstr "%d mesaje găsite.\n"
+msgstr "Mesajul nu a fost găsit."
 
 #: src/query_search.c:549
-#, fuzzy
 msgid "1 message found."
-msgstr "%d mesaje găsite.\n"
+msgstr "A fost găsit 1 mesaj."
 
 #: src/query_search.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "%d messages found."
-msgstr "%d mesaje găsite.\n"
+msgstr "Au fost găsite %d mesaje."
 
 #: src/query_search.c:579
 #, c-format
@@ -6385,12 +6378,12 @@ msgstr "Eroare la verificarea semnăturii"
 #: src/select-keys.c:107
 #, c-format
 msgid "Please select key for `%s'"
-msgstr "Selectați o cheie pentru '%s'"
+msgstr "Selectați o cheie pentru „%s”"
 
 #: src/select-keys.c:110
 #, c-format
 msgid "Collecting info for `%s' ... %c"
-msgstr "Colectare informații pentru '%s' ... %c"
+msgstr "Colectare informații pentru „%s” ... %c"
 
 #: src/select-keys.c:293
 msgid "Select Keys"
@@ -6521,14 +6514,13 @@ msgstr ""
 "%s"
 
 #: src/send_message.c:954
-#, fuzzy
 msgid "Can't connect to SMTP server."
-msgstr "Nu se poate efectua conexiunea la serverul NNTP: %s:%d\n"
+msgstr "Nu se poate efectua conexiunea la serverul SMTP."
 
 #: src/send_message.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to SMTP server: %s:%d"
-msgstr "Nu se poate efectua conexiunea la serverul NNTP: %s:%d\n"
+msgstr "Nu se poate efectua conexiunea la serverul SMTP: %s:%d"
 
 #: src/setup.c:43
 msgid "Mailbox setting"
@@ -6960,92 +6952,92 @@ msgstr "Stabilire sumar din datele din mesaj..."
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ștergere\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Ștergere mesaj(e)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Chiar vreți să ștergeți mesajul (mesajele) de la gunoi ?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Ștergere mesaje duplicate..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Destinația este aceeași cu folderul curent."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Destinația pentru copiere este aceeași cu folderul curent."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "A apărut o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Construire fire de discuție..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuție..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nu."
 
diff --git a/po/ru.po b/po/ru.po
index 944b0799..1fb3be3a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -507,11 +507,11 @@ msgstr "Найдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Фильтр спама"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Фильтр спама"
 
@@ -686,7 +686,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адрес"
@@ -835,7 +835,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
@@ -856,8 +856,8 @@ msgstr "/Файл/Новый файл JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -876,21 +876,21 @@ msgstr "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
@@ -922,7 +922,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -935,12 +935,12 @@ msgstr "/Инструменты/Импорт файла LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -958,7 +958,7 @@ msgid "/New _Folder"
 msgstr "/Новая папка"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -995,17 +995,17 @@ msgstr "Адресная книга"
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скрытно:"
@@ -1208,7 +1208,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1259,395 +1259,395 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Добавить..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/Файл/Отправить"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/Файл/Отправить позже"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Сохранить в папке черновиков"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Сохранить и продолжить правку"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/Файл/Вложить файл"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставить текст из файла"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставить подпись"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Добавить подпись в конец"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/Правка/Отменить"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Повторить"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить всё"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Правка/Отформатировать абзац"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Правка/Отформатировать всё сообщение"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Вид"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/Вид/Кому"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/Вид/Копия"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/Вид/Адрес для ответа"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вид/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/Вид/Следовать к"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/Вид/Линейка"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вид/Настроить панель инструментов"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Кодировка"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Кодировка/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вид/Кодировка/Балтийская (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вид/Кодировка/Арабская (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Иврит (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Иврит (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллица (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Кириллица (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Кириллица\\/Украина (KOI8-_U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллица (_Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Китайская традиционная (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/Инструменты/Проверить орфографию"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Язык для проверки орфографии"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Вложения"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматически устанавливать адреса"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Отправить"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1655,25 +1655,25 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1701,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1722,89 +1722,89 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,48 +1814,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2794,7 +2794,7 @@ msgstr "Получение сообщения (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Приём (принято сообщений: %d (%s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3660,7 +3660,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3915,7 +3915,7 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
@@ -5925,17 +5925,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
 
@@ -5945,7 +5945,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Кому:"
@@ -6873,92 +6873,92 @@ msgstr "Формирование списка сообщений..."
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Номер"
 
diff --git a/po/sk.po b/po/sk.po
index bf491ade..41fe24ca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -503,12 +503,12 @@ msgstr "Nájdené %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavenie uložené.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Priečinok"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Priečinok"
@@ -681,7 +681,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -818,7 +818,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresár"
@@ -832,7 +832,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
@@ -854,8 +854,8 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -874,21 +874,21 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
@@ -920,7 +920,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -934,12 +934,12 @@ msgstr "/_Nástroje/Importovať súbor _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -996,17 +996,17 @@ msgstr "Otvoriť adresár"
 msgid "Name:"
 msgstr "Meno:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kópia:"
@@ -1218,7 +1218,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1269,437 +1269,437 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prílohy"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,25 +1707,25 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1736,12 +1736,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1767,91 +1767,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1861,52 +1861,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2867,7 +2867,7 @@ msgstr "Prijímam správu (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3762,7 +3762,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -4001,7 +4001,7 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
@@ -6102,17 +6102,17 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Dátum"
 
@@ -6122,7 +6122,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Komu:"
@@ -7072,93 +7072,93 @@ msgstr "Vytváram zoznam správ..."
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Č."
 
diff --git a/po/sl.po b/po/sl.po
index 042c2d55..f37474ae 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -508,12 +508,12 @@ msgstr "Najden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je shranjena.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Mapa"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mapa"
@@ -689,7 +689,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Naslov"
@@ -838,7 +838,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -860,8 +860,8 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -880,21 +880,21 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
@@ -926,7 +926,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -940,12 +940,12 @@ msgstr "/_Orodja/Uvoz datoteke _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -963,7 +963,7 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1002,17 +1002,17 @@ msgstr "Imenik naslovov"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skp:"
@@ -1223,7 +1223,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1274,438 +1274,438 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priloge"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1713,25 +1713,25 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1741,12 +1741,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1755,15 +1755,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1772,92 +1772,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1867,52 +1867,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2872,7 +2872,7 @@ msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3766,7 +3766,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -4004,7 +4004,7 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
@@ -6104,17 +6104,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -6124,7 +6124,7 @@ msgid "Number"
 msgstr "Število"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -7072,94 +7072,94 @@ msgstr "Nastavljam povzetek iz podatkov sporočila..."
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Ne."
 
diff --git a/po/sr.po b/po/sr.po
index 097a8e6d..afc0854e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -509,12 +509,12 @@ msgstr "Pronađeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Direktorijum"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Direktorijum"
@@ -689,7 +689,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -838,7 +838,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -860,8 +860,8 @@ msgstr "/_Datoteka/Novi _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -880,21 +880,21 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
@@ -926,7 +926,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -940,12 +940,12 @@ msgstr "/_Datoteka/Unesi _LDIF datoteku"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -963,7 +963,7 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -1002,17 +1002,17 @@ msgstr "Adresar"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1217,7 +1217,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1268,438 +1268,438 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/compose.c:555
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:558
+#: src/compose.c:562
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u direktorijum _nedovršeno"
 
-#: src/compose.c:560
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije i nastavi da pišeš"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Prikači datoteku"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Izmeni/_Undo"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Izmeni/Sažmi trenutni _paragraf"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 
-#: src/compose.c:586
+#: src/compose.c:590
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Pregled/_Za"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Pregled/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Pregled/_Odgovori"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pregled/P_rosledi"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Len_jir"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:698
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:699
+#: src/compose.c:703
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Alati/_Izvrši"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Dodatak"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,26 +1707,26 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1736,12 +1736,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1767,92 +1767,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1862,52 +1862,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2867,7 +2867,7 @@ msgstr "Primam poruke (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3762,7 +3762,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4000,7 +4000,7 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -6099,17 +6099,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -6119,7 +6119,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -7070,94 +7070,94 @@ msgstr "Postavljanje pregleda od podataka poruke..."
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Ne."
 
diff --git a/po/sv.po b/po/sv.po
index 0c7edf0d..6d3a1d69 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -506,12 +506,12 @@ msgstr "Fann %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurationen är sparad.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Skräppostfilter"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
@@ -686,7 +686,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adress"
@@ -835,7 +835,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -857,8 +857,8 @@ msgstr "/_Arkiv/Ny _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -877,21 +877,21 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
@@ -923,7 +923,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -937,12 +937,12 @@ msgstr "/V_erktyg/Importera _LDIF-fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -960,7 +960,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -999,17 +999,17 @@ msgstr "Adressbok"
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Dold kopia:"
@@ -1214,7 +1214,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Notera"
 
@@ -1265,404 +1265,404 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visa/_Teckenkodning/_Automatisk"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Teckenkodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bilagor"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1670,26 +1670,26 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1700,11 +1700,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1717,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1734,89 +1734,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,48 +1826,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2821,7 +2821,7 @@ msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3699,7 +3699,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3931,7 +3931,7 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
@@ -5975,17 +5975,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
 
@@ -5995,7 +5995,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Till:"
@@ -6941,92 +6941,92 @@ msgstr "Skapar summering från meddelandedata..."
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/tr.po b/po/tr.po
index 33663d2e..c7c84d4c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -507,12 +507,12 @@ msgstr "%s bulundu\n"
 msgid "Configuration is saved.\n"
 msgstr "Yapılandırma kaydedildi.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "dizin:"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "dizin:"
@@ -684,7 +684,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -821,7 +821,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adres"
@@ -835,7 +835,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
@@ -857,8 +857,8 @@ msgstr "/_Dosya/Yeni _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -877,21 +877,21 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
@@ -923,7 +923,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -937,12 +937,12 @@ msgstr "/A_raçlar/_LDIF dosyasını ekle"
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -960,7 +960,7 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -999,17 +999,17 @@ msgstr "Adres defteri"
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1219,7 +1219,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Not"
 
@@ -1270,429 +1270,429 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizinine kaydet"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Şuanki paragrafı kaydır"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Görünüm/_Yanıtla/"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Görünüm/_Kodlama/"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Görünüm/_Kodlama/7 bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Ekler"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Konu:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Gönder"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1700,25 +1700,25 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1729,12 +1729,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1743,15 +1743,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1760,91 +1760,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1854,52 +1854,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2856,7 +2856,7 @@ msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3739,7 +3739,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -3973,7 +3973,7 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
@@ -6049,17 +6049,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Tarih"
 
@@ -6069,7 +6069,7 @@ msgid "Number"
 msgstr "Numara"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Kime:"
@@ -7021,92 +7021,92 @@ msgstr "İleti bilgisinden özet atanıyor..."
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Hayır."
 
diff --git a/po/uk.po b/po/uk.po
index 59d73b35..45e2eb54 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+0900\n"
 "PO-Revision-Date: 2008-01-18 19:07+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -512,11 +512,11 @@ msgstr "Знайдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 msgid "Junk mail filter (manual)"
 msgstr "Фільтр мотлоху (вручну)"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
@@ -689,7 +689,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Адреса"
@@ -838,7 +838,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
@@ -859,8 +859,8 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -879,21 +879,21 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
@@ -925,7 +925,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -938,12 +938,12 @@ msgstr "/Інструменти/Імпортувати файл LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -961,7 +961,7 @@ msgid "/New _Folder"
 msgstr "/Нова папка"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -998,17 +998,17 @@ msgstr "Адресна книга"
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Приховано:"
@@ -1205,7 +1205,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1256,395 +1256,395 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Ніякий"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/Файл/Послати"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/Файл/Послати пізніше"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти в папці чернеток"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Приєднати підпис"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Undo"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Згорнути поточний абзац"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Згорнути всі довгі рядки"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:591
+#: src/compose.c:595
 msgid "/_View/_Reply-To"
 msgstr "/Вигляд/Зворотня адреса"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 msgid "/_View/_Followup-To"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:599
+#: src/compose.c:603
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вигляд/Налаштувати панель інструментів"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодова таблиця/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (Windows-1257)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (_Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/Інструменти/Перевірка правопису"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Вкладення"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично встановлювати наступні адреси"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Послати"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,25 +1652,25 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1681,11 +1681,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1698,15 +1698,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1720,89 +1720,89 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалось відкрити файл %s."
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1811,48 +1811,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2790,7 +2790,7 @@ msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3655,7 +3655,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3909,7 +3909,7 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
@@ -5912,17 +5912,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
 
@@ -5932,7 +5932,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 msgid "To"
 msgstr "Кому:"
 
@@ -6859,92 +6859,92 @@ msgstr "Формуємо список з даних листів..."
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Номер"
 
diff --git a/po/vi.po b/po/vi.po
index 7cd8a71d..4201f3e9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -504,12 +504,12 @@ msgstr "Tìm thấy %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Cấu hình đã được lưu.\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Lọc thư rác"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
@@ -668,7 +668,7 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -803,7 +803,7 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Địa chỉ"
@@ -817,7 +817,7 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
@@ -838,8 +838,8 @@ msgstr "/_Tập tin/_JPilot mới"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -858,21 +858,21 @@ msgstr "/_Tập tin/_Xoá"
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
@@ -904,7 +904,7 @@ msgstr "/Đị_a chỉ/_Soạn"
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
@@ -918,12 +918,12 @@ msgstr "/_Công cụ/_Nhập tập tin LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
@@ -941,7 +941,7 @@ msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -980,17 +980,17 @@ msgstr "Sổ địa chỉ"
 msgid "Name:"
 msgstr "Tên:"
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1197,7 +1197,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1248,399 +1248,399 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "Không"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/Thê_m..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/_Tập tin/_Gửi"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/_Tập tin/Gửi _sau"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/_Tập tin/Lưu vào thư mục _nháp"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/_Tập tin/Lưu và _tiếp tục soạn"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/_Tập tin/Đính _kèm tập tin"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/_Tập tin/_Chèn tập tin"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/_Tập tin/Chèn _chữ kí"
 
-#: src/compose.c:567
+#: src/compose.c:571
 msgid "/_File/A_ppend signature"
 msgstr "/_Tập tin/Thêm _chữ kí"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/_Soạn/_Hoàn tác"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/_Soạn/Ch_uyển tác"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Soạn/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/_Soạn/_Cắt"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Soạn/Chọ_n tất cả"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Soạn/_Khuôn dòng đoạn hiện tại"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Soạn/Khuôn _mọi dòng dài"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Xem"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/_Xem/_Người nhận"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/_Xem/_Cc"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/_Xem/_Bcc"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Xem/_Hồi âm cho"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Xem/Tiế_p sau"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/_Xem/_Thước kẻ"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/_Xem/Đí_nh kèm"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Xem/Mã _kí tự/_Tự động"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Xem/Mã _kí tự/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Xem/Mã _kí tự/Trung Âu (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Xem/Mã _kí tự/Hi Lạp (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Xem/Mã _kí tự/A-rập (ISO-8859-_6)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Xem/Mã _kí tự/Thổ Nhĩ Kì (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Xem/Mã _kí tự/Hán giản thể (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Công cụ/Soạ_n với chương trình ngoài"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Công cụ/Chữ _kí PGP"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Công cụ/Mã hoá _PGP"
 
-#: src/compose.c:704
+#: src/compose.c:708
 msgid "/_Tools/_Check spell"
 msgstr "/_Công cụ/Kiểm tra _chính tả"
 
-#: src/compose.c:705
+#: src/compose.c:709
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 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:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Đính kèm"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1648,25 +1648,25 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 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:3412
+#: src/compose.c:3416
 #, 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:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1677,11 +1677,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1694,15 +1694,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1711,89 +1711,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 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:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, 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:6359
+#: src/compose.c:6377
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1802,48 +1802,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 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:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, 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:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2795,7 +2795,7 @@ msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Đang lấy về (đã nhận %d thư (%s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3665,7 +3665,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3921,7 +3921,7 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
@@ -5939,17 +5939,17 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "Thời gian"
 
@@ -5959,7 +5959,7 @@ msgid "Number"
 msgstr "Số"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "Người nhận:"
@@ -6893,92 +6893,92 @@ msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "Số "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8e5dfb09..00bdf8f9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -502,12 +502,12 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "文件夹："
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -815,7 +815,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "地址"
@@ -829,7 +829,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -851,8 +851,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -871,21 +871,21 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
@@ -917,7 +917,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -931,12 +931,12 @@ msgstr "/工具(_T)/导入LDIF文件(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -954,7 +954,7 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -993,17 +993,17 @@ msgstr "地址簿"
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
@@ -1205,7 +1205,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1256,408 +1256,408 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附件"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1665,25 +1665,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1693,12 +1693,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1707,15 +1707,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1724,91 +1724,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,51 +1818,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2818,7 +2818,7 @@ msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3693,7 +3693,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3926,7 +3926,7 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -5982,17 +5982,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "日期"
 
@@ -6002,7 +6002,7 @@ msgid "Number"
 msgstr "序号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "收件人："
@@ -6951,92 +6951,92 @@ msgstr "正在从邮件数据中设置摘要..."
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a1318753..dd7bf4bf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 14:57+0900\n"
+"POT-Creation-Date: 2008-05-16 11:38+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"
@@ -507,12 +507,12 @@ msgstr "找到 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "組態設定已儲存。\n"
 
-#: libsylph/prefs_common.c:570
+#: libsylph/prefs_common.c:574
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "垃圾郵件資料夾"
 
-#: libsylph/prefs_common.c:573
+#: libsylph/prefs_common.c:577
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
@@ -683,7 +683,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5086 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5090 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -818,7 +818,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:187 src/compose.c:3200 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3204 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "地址"
@@ -832,7 +832,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:351 src/compose.c:552 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:556 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -854,8 +854,8 @@ msgstr "/檔案(_F)/新增J-Pilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:557
-#: src/compose.c:562 src/compose.c:565 src/compose.c:568 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:561
+#: src/compose.c:566 src/compose.c:569 src/compose.c:572 src/mainwindow.c:543
 #: src/mainwindow.c:546 src/mainwindow.c:548 src/mainwindow.c:550
 #: src/mainwindow.c:555 src/mainwindow.c:557 src/messageview.c:151
 #: src/messageview.c:156
@@ -874,21 +874,21 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:569 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:573 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:571 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:575 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:368 src/compose.c:576 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:580 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:369 src/compose.c:577
+#: src/addressbook.c:369 src/compose.c:581
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
@@ -920,7 +920,7 @@ msgstr "/地址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:687 src/mainwindow.c:807
+#: src/addressbook.c:379 src/compose.c:691 src/mainwindow.c:807
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -934,12 +934,12 @@ msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:383 src/compose.c:708 src/mainwindow.c:861
+#: src/addressbook.c:383 src/compose.c:712 src/mainwindow.c:861
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:384 src/compose.c:709 src/mainwindow.c:873
+#: src/addressbook.c:384 src/compose.c:713 src/mainwindow.c:873
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:546 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:550 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
 #: src/folderview.c:284 src/folderview.c:298 src/folderview.c:300
@@ -996,17 +996,17 @@ msgstr "通訊錄"
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:673 src/compose.c:3145 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3149 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:677 src/compose.c:3162 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3166 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:681 src/compose.c:3179 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3183 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
@@ -1210,7 +1210,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6362 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6380 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1261,404 +1261,404 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4939
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:544
+#: src/compose.c:548
 msgid "/_Add..."
 msgstr "/新增(_A)..."
 
-#: src/compose.c:545
+#: src/compose.c:549
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:547 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:551 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/內容(_P)..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:555
+#: src/compose.c:559
 msgid "/_File/Send _later"
 msgstr "/檔案(_F)/稍後傳送(_L)"
 
-#: src/compose.c:558
+#: src/compose.c:562
 msgid "/_File/Save to _draft folder"
 msgstr "/檔案(_F)/儲存至草稿資料夾(_D)"
 
-#: src/compose.c:560
+#: src/compose.c:564
 msgid "/_File/Save and _keep editing"
 msgstr "/檔案(_F)/儲存並繼續編輯(_K)"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:564
+#: src/compose.c:568
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽章(_G)"
 
-#: src/compose.c:567
+#: src/compose.c:571
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/檔案(_F)/插入簽章(_G)"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:573
+#: src/compose.c:577
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:574 src/compose.c:581 src/mainwindow.c:565
+#: src/compose.c:578 src/compose.c:585 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:575
+#: src/compose.c:579
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_T)"
 
-#: src/compose.c:578
+#: src/compose.c:582
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
 
-#: src/compose.c:580 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:584 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_A)"
 
-#: src/compose.c:582
+#: src/compose.c:586
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折列(_W)"
 
-#: src/compose.c:584
+#: src/compose.c:588
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的列折換(_L)"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
-#: src/compose.c:587 src/mainwindow.c:571 src/messageview.c:166
+#: src/compose.c:591 src/mainwindow.c:571 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/顯示(_V)"
 
-#: src/compose.c:588
+#: src/compose.c:592
 msgid "/_View/_To"
 msgstr "/顯示(_V)/收件人(_T)"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "/_View/_Cc"
 msgstr "/顯示(_V)/副本(_C)"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_View/_Bcc"
 msgstr "/顯示(_V)/密件副本(_S)"
 
-#: src/compose.c:591
+#: src/compose.c:595
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/顯示(_V)/回覆(_R)"
 
-#: src/compose.c:592 src/compose.c:594 src/compose.c:596 src/compose.c:598
-#: src/compose.c:601 src/mainwindow.c:594 src/mainwindow.c:600
+#: src/compose.c:596 src/compose.c:598 src/compose.c:600 src/compose.c:602
+#: src/compose.c:605 src/mainwindow.c:594 src/mainwindow.c:600
 #: src/mainwindow.c:627 src/mainwindow.c:651 src/mainwindow.c:754
 #: src/mainwindow.c:758 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
-#: src/compose.c:593
+#: src/compose.c:597
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/顯示(_V)/回應文章(_F)"
 
-#: src/compose.c:595
+#: src/compose.c:599
 msgid "/_View/R_uler"
 msgstr "/顯示(_V)/尺規(_U)"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/compose.c:607 src/mainwindow.c:658 src/messageview.c:173
+#: src/compose.c:611 src/mainwindow.c:658 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 
-#: src/compose.c:610 src/compose.c:616 src/compose.c:622 src/compose.c:626
-#: src/compose.c:634 src/compose.c:638 src/compose.c:644 src/compose.c:650
-#: src/compose.c:654 src/compose.c:664 src/compose.c:668 src/compose.c:676
-#: src/compose.c:680 src/mainwindow.c:654 src/mainwindow.c:661
+#: src/compose.c:614 src/compose.c:620 src/compose.c:626 src/compose.c:630
+#: src/compose.c:638 src/compose.c:642 src/compose.c:648 src/compose.c:654
+#: src/compose.c:658 src/compose.c:668 src/compose.c:672 src/compose.c:680
+#: src/compose.c:684 src/mainwindow.c:654 src/mainwindow.c:661
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:612 src/mainwindow.c:662 src/messageview.c:177
+#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:614 src/mainwindow.c:664 src/messageview.c:180
+#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字元編碼(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:618 src/mainwindow.c:668 src/messageview.c:183
+#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:620 src/mainwindow.c:670 src/messageview.c:185
+#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:624 src/mainwindow.c:676 src/messageview.c:190
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:628 src/mainwindow.c:680 src/messageview.c:193
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:630 src/mainwindow.c:682 src/messageview.c:195
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:632 src/mainwindow.c:684 src/messageview.c:197
+#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:636 src/mainwindow.c:688 src/messageview.c:200
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:692 src/messageview.c:203
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:642 src/mainwindow.c:694 src/messageview.c:205
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:698 src/messageview.c:208
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:648 src/mainwindow.c:700 src/messageview.c:210
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:652 src/mainwindow.c:704 src/messageview.c:213
+#: src/compose.c:656 src/mainwindow.c:704 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:216
+#: src/compose.c:660 src/mainwindow.c:708 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:218
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:220
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:222
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:225
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:234
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GB2312)"
 
-#: src/compose.c:672 src/mainwindow.c:730 src/messageview.c:236
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GBK)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:238
+#: src/compose.c:678 src/mainwindow.c:732 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (_Big5)"
 
-#: src/compose.c:678 src/mainwindow.c:740 src/messageview.c:245
+#: src/compose.c:682 src/mainwindow.c:740 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (EUC-_KR)"
 
-#: src/compose.c:682 src/mainwindow.c:746 src/messageview.c:250
+#: src/compose.c:686 src/mainwindow.c:746 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 
-#: src/compose.c:684 src/mainwindow.c:748 src/messageview.c:252
+#: src/compose.c:688 src/mainwindow.c:748 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:688 src/mainwindow.c:808 src/messageview.c:283
+#: src/compose.c:692 src/mainwindow.c:808 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
-#: src/compose.c:689
+#: src/compose.c:693
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:691 src/mainwindow.c:832 src/messageview.c:299
+#: src/compose.c:695 src/mainwindow.c:832 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:693 src/compose.c:697 src/compose.c:703 src/mainwindow.c:811
+#: src/compose.c:697 src/compose.c:701 src/compose.c:707 src/mainwindow.c:811
 #: src/mainwindow.c:825 src/mainwindow.c:830 src/mainwindow.c:833
 #: src/mainwindow.c:837 src/mainwindow.c:839 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:694
+#: src/compose.c:698
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_X)"
 
-#: src/compose.c:698
+#: src/compose.c:702
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_G)"
 
-#: src/compose.c:699
+#: src/compose.c:703
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:704
+#: src/compose.c:708
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/執行(_X)"
 
-#: src/compose.c:705
+#: src/compose.c:709
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:969
+#: src/compose.c:973
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1073 src/compose.c:1147
+#: src/compose.c:1077 src/compose.c:1151
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1627
+#: src/compose.c:1631
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1639
+#: src/compose.c:1643
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2127
+#: src/compose.c:2131
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2131
+#: src/compose.c:2135
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2135 src/compose.c:4180
+#: src/compose.c:2139 src/compose.c:4184
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2139
+#: src/compose.c:2143
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2172
+#: src/compose.c:2176
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2232 src/mimeview.c:583
+#: src/compose.c:2236 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2722 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2726 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2725
+#: src/compose.c:2729
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2840
+#: src/compose.c:2844
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2848
+#: src/compose.c:2852
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2849
+#: src/compose.c:2853
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2913
+#: src/compose.c:2917
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附加檔"
 
-#: src/compose.c:2914
+#: src/compose.c:2918
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3031 src/compose.c:3057
+#: src/compose.c:3035 src/compose.c:3061
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3077
+#: src/compose.c:3081
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/compose.c:3090 src/compose.c:4952 src/headerview.c:54
+#: src/compose.c:3094 src/compose.c:4956 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3112 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3116 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "主旨："
 
-#: src/compose.c:3205
+#: src/compose.c:3209
 #, fuzzy
 msgid "_Send"
 msgstr "送出"
 
-#: src/compose.c:3290
+#: src/compose.c:3294
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3310
+#: src/compose.c:3314
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1666,25 +1666,25 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3324 src/send_message.c:315
+#: src/compose.c:3328 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3374
+#: src/compose.c:3378
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3412
+#: src/compose.c:3416
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3540 src/compose.c:3879 src/compose.c:3942 src/compose.c:4062
+#: src/compose.c:3544 src/compose.c:3883 src/compose.c:3946 src/compose.c:4066
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3573
+#: src/compose.c:3577
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1694,11 +1694,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3579
+#: src/compose.c:3583
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3665
+#: src/compose.c:3669
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1711,15 +1711,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3669
+#: src/compose.c:3673
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3831
+#: src/compose.c:3835
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3832
+#: src/compose.c:3836
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1728,89 +1728,89 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4022
+#: src/compose.c:4026
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:4040
+#: src/compose.c:4044
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:4128
+#: src/compose.c:4132
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:4135
+#: src/compose.c:4139
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4175
+#: src/compose.c:4179
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:4184
+#: src/compose.c:4188
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:4784
+#: src/compose.c:4788
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4899
+#: src/compose.c:4903
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:5026
+#: src/compose.c:5030
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:5029
+#: src/compose.c:5033
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5067 src/compose.c:6181
+#: src/compose.c:5071 src/compose.c:6199
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:5076 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5088
+#: src/compose.c:5080 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5089
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6076
+#: src/compose.c:6094
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6094
+#: src/compose.c:6112
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6163
+#: src/compose.c:6181
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:6183 src/prefs_common_dialog.c:1579
+#: src/compose.c:6201 src/prefs_common_dialog.c:1579
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6206 src/prefs_folder_item.c:202
+#: src/compose.c:6224 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6207
+#: src/compose.c:6225
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6297
+#: src/compose.c:6315
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6359
+#: src/compose.c:6377
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1820,48 +1820,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6696 src/mainwindow.c:2977
+#: src/compose.c:6714 src/mainwindow.c:2977
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6816 src/compose.c:6821 src/compose.c:6827
+#: src/compose.c:6834 src/compose.c:6839 src/compose.c:6845
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6918
+#: src/compose.c:6936
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6941
+#: src/compose.c:6959
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6976
+#: src/compose.c:7010
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6977
+#: src/compose.c:7011
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6979
+#: src/compose.c:7013
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:7021
+#: src/compose.c:7055
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:7023
+#: src/compose.c:7057
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7024
+#: src/compose.c:7058
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2815,7 +2815,7 @@ msgstr "取得新郵件 (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4500
+#: src/inc.c:1218 src/inc.c:1238 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3682,7 +3682,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
 #: src/mainwindow.c:1180 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4065 src/summaryview.c:4194 src/summaryview.c:4571
+#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3914,7 +3914,7 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3623
+#: src/messageview.c:765 src/summaryview.c:3624
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
@@ -5944,17 +5944,17 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5081
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5082
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5084
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/summaryview.c:5085
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5086
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/summaryview.c:5087
 msgid "Date"
 msgstr "日期"
 
@@ -5964,7 +5964,7 @@ msgid "Number"
 msgstr "編號"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:80 src/summaryview.c:5092
+#: src/prefs_summary_column.c:80 src/summaryview.c:5093
 #, fuzzy
 msgid "To"
 msgstr "收件人"
@@ -6909,92 +6909,92 @@ msgstr "產生郵件列表中..."
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2826
+#: src/summaryview.c:2827
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2894
+#: src/summaryview.c:2895
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:3095
+#: src/summaryview.c:3096
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3156
+#: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3184
+#: src/summaryview.c:3185
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3186
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3259
+#: src/summaryview.c:3260
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3297
+#: src/summaryview.c:3298
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3357
+#: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3389
+#: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3456
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3486
+#: src/summaryview.c:3487
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3666
+#: src/summaryview.c:3667
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3972 src/summaryview.c:3973
+#: src/summaryview.c:3973 src/summaryview.c:3974
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4123 src/summaryview.c:4124
+#: src/summaryview.c:4124 src/summaryview.c:4125
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4417 src/summaryview.c:4478
+#: src/summaryview.c:4418 src/summaryview.c:4479
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4540
+#: src/summaryview.c:4541
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4542
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4578
+#: src/summaryview.c:4579
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-- 
cgit v1.2.3