the feature to confirm missing attachments was added.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1968 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2008-03-28 07:15:51 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2008-03-28 07:15:51 +0000
commit: eb8893ef1a4f97c86f0fa4bacb8695f8d26ccb29 (patch)
tree: d9cad24a5faf420b73325e6b7eef0df572877b4e /po
parent: faa04e6bd711567a9b2437d7d99593baac90fad6 (diff)
30 files changed, 11729 insertions, 11160 deletions
diff --git a/po/be.po b/po/be.po
index 920e8cd7..b039aebb 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Фільтр непажаданай пошты (ручны)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -827,7 +827,7 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
@@ -848,8 +848,8 @@ msgstr "/Ф_айл/Новы _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -868,21 +868,21 @@ msgstr "/Ф_айл/_Выдаліць"
 msgid "/_File/_Save"
 msgstr "/Ф_айл/Запісаць"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закрыць"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Рэдагаваць"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Рэдагаваць/Капіраваць"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Рэдагаваць/Ўставіць"
 
@@ -914,7 +914,7 @@ msgstr "/_Адрас/Рэдагаваць"
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/_Выдаліць"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
@@ -927,12 +927,12 @@ msgstr "/_Прылады/Імпартаваць файл _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Даведка"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Даведка/_Аб праграме"
@@ -950,7 +950,7 @@ msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -978,7 +978,7 @@ msgstr "/_Уставіць"
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Адрасная кніга"
 
@@ -1152,7 +1152,7 @@ msgstr "Памылка канверсіі Адраснай кнігі"
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Інтэрфейс"
 
@@ -1198,7 +1198,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабісты адрас"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1253,360 +1253,369 @@ msgstr "Карычневы"
 msgid "None"
 msgstr "Няма"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Дадаць..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Выдаліць"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Уласцівасці..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/Ф_айл/В_ыслаць"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/Ф_айл/Выслаць пазней"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/Ф_айл/Запісаць у каталог чарна_вікоў"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/Ф_айл/Запісаць і рэдагаваць да_лей"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/Ф_айл/Далучыць _файл"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/Ф_айл/Ўставіць файл"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/Ф_айл/Ўставіць _подпіс"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/Ф_айл/Далучыць подпіс"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Рэдагаваць/Адкаціць"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Рэдагаваць/Паўтарыць"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Рэдагаваць/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Рэдагаваць/Выразаць"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Рэдагаваць/Ўставіць як цытату"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Рэдагаваць/Вылучыць усё"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Рэдагаваць/Завярну_ць бягучы параграф"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Рэдагаваць/Перанесці усе _доўгія радкі"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Рэдагаваць/А_ўтаперанос"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Выгляд"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/Выгляд/_Да"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/Выгляд/_Копія"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/Выгляд/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/Выгляд/Ад_казваць"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Выгляд/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/Выгляд/Узыходзіць д_а"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/Выгляд/_Лінейка"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/Выгляд/Дадатак"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Выгляд/Наставіць стужку пр_ылад..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Выгляд/Знаказбор"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Выгляд/Знаказбор/Аўтаматычна"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Выгляд/Знаказбор/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Выгляд/Знаказбор/Юнікод (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Выгляд/Знаказбор/Арабскі (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Выгляд/Знаказбор/Тайскі (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Выгляд/Знаказбор/Тайскі (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Прылады/_Адрасная кніга"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Прылады/_Шаблон"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Прылады/Дзеянні"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Прылады/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Прылады/Рэдагаваць знешнім рэдактарам"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Прылады/_Подпіс PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Прылады/Шыфр GPG"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Прылады/Правяраць правапі_с"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову правапісу"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэксту\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файлу %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначана. Выслаць як ёсць?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Дадаткі"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1614,26 +1623,26 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўкай."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Нельга запісаць паведамленне ў `дасланыя'."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1644,11 +1653,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1661,15 +1670,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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 "
@@ -1683,93 +1692,93 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "змяшчаю паведамленне ў чаргу...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл пазнак.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Ствараю вакно напісання...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1778,48 +1787,48 @@ msgstr ""
 "Знешні рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -1999,7 +2008,7 @@ msgstr "Змяніць запіс JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2300,7 +2309,7 @@ msgstr "Перазборка дрэва каталогу схібіла."
 msgid "Checking for new messages in all folders..."
 msgstr "Правяраю новыя паведамленні ва ўсіх каталогах..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Спам"
 
@@ -4051,21 +4060,21 @@ msgstr "Пераважанні акаунта"
 msgid "Creating account preferences window...\n"
 msgstr "Ствараю вакно пераважанняў акаунта...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Атрыманне"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Адпраўка"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Напісанне"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Прыватнасць"
 
@@ -4073,7 +4082,7 @@ msgstr "Прыватнасць"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Адмысловыя"
 
@@ -4197,7 +4206,7 @@ msgid "Authentication method"
 msgstr "Метад аўтэнтыфікацыі"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
@@ -4241,8 +4250,8 @@ msgstr "Генераваць Message-ID"
 msgid "Add user-defined header"
 msgstr "Дадаць загаловак, заданы карыстальнікам"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Рэдагаваць..."
 
@@ -4267,7 +4276,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Аўтэнтыфікацыя POP3 перад адпраўкай"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Подпіс"
@@ -4575,85 +4584,85 @@ msgstr "Выдаліць дзеянне"
 msgid "Do you really want to delete this action?"
 msgstr "Сапраўды жадаеце выдаліць гэта дзеянне?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Ствараю вакно агульных пераважанняў...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Агульныя пераважанні"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Выгляд"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Спам"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Дэталі"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Аўта-праверка новай пошты"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "кожныя"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "хвілін(а)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Правяраць новую пошту пры запуску"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Аднаўляць усе лакальныя каталогі пасля атрымання"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Выконваць загад па прыбыцці новых паведамленняў"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Загад"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' будзе заменена на колькасць новых паведамленняў."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Атрымліваць з лакальнага спула"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Фільтраваць падчас атрымання"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Шлях да спула"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Захоўваць адпраўленыя лісты ў Дасланых"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Ужываць правілы фільтра да дасланых лістоў"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Кадаванне перадачы"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4661,15 +4670,15 @@ msgstr ""
 "Выберыце кадаванне перадачы зместу (Content-Transfer-Encoding), якое "
 "ўжываецца, калі цела паведамлення утрымлівае не-ASCII сімвалы."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Кадаванне імён файлаў MIME"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME header"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4679,171 +4688,181 @@ msgstr ""
 "MIME header: найбольш папулярны, але парушае RFC 2047\n"
 "RFC 2231: адпавядае стандарту, але не папулярны"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Агульныя"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Аддзельнік подпісу"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Устаўляць аўтаматычна"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Адказаць"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Аўтаматычны выбар акаунта для адказаў"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Цытаваць паведамленне пры адказе"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Кнопка Адказаць выклікае адказ у спіс рассылкі"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Захоўваць папярэднія адрасы пры адказе на свае паведамленні"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Рэдактар"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Аўтаматычна запускаць знешні рэдактар"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Глыбіня гісторыі зменаў"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Заварочваць лісты па"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "сімвалаў"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Пераносіць цытаты"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Пераносіць пры ўводзе"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Аўта-запіс ў чарнавікі"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Фармат"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Праверка правапісу"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Фармат адказу"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Знак цытаты"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Фармат перасылкі"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Апісанне сімвалаў "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Ужываць Праверку правапісу"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Прадвызначаная мова:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Шрыфт тэксту"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Від Каталога"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Паказваць лік нечытаных лістоў побач з назвай каталога"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Паказваць слупкі ліку лістоў у праглядзе каталогаў"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скарачаць назвы груп даўжэй за "
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "літар"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Выгляд Зводкі"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Паказваць адрасатаў ў слупку `Ад', калі адпраўнік - вы"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Разгортваць ніткі"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Фармат даты"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Наставіць від запісаў зводкі... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Паведамленне"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Тыповы знаказбор"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Ужываецца пры паказе паведамленняў, у якіх не указаны знаказбор."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Зыходзячы знаказбор"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4851,11 +4870,11 @@ msgstr ""
 "Калі выбрана `Аўтаматычна', аптымальнае для бягучай лакалі кадаванне будзе "
 "ужытае."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Дазволіць афарбоўку паведамлення"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4863,84 +4882,84 @@ msgstr ""
 "Паказваць шматбайтны алфавіт і лічбы\n"
 "як сімвалы ASCII (толькі японскія)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Паказваць стужку загалоўкаў па-над праглядам паведамлення"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Паказваць кароткія загалоўкі ў праглядзе ліста"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Адлюстроўваць HTML-паведамленні як тэкст"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Адлюстроўваць HTML-паведамленні як тэкст"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Паказваць курсор у праглядзе паведамлення"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Прастор між радкоў"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "піксел(аў)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Пракрутка"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Палова старонкі"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Гладкая пракрутка"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Рысункі"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Падганяць памер вялікіх далучаных рысункаў да памеру вакна"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Паказваць рысункі побач з тэкстам"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Задзейнічаць кіраванне СПАМам"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Загад вучэння:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Выберыце набор)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Не-спам"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Загад класіфікацыі"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4948,206 +4967,206 @@ msgstr ""
 "Каб класіфікаваць спам аўтаматычна, і спам і не-спам лісты павінны быць "
 "вывучаны самастойна да пэўнага моманту."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Каталог спаму"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Паведамленні, пазначаныя як спам, будуць пераносіцца у гэты каталог."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Фільтраваць лісты, класіфікаваныя як спам, падчас атрымання"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Фільтраваць спам перад звычайным фільтрам"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Выдаляць спам з сервера падчас атрымання"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Пазначаць лісты, класіфікаваныя як спам, прачытанымі"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Аўтаматычна правяраць подпісы"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Паказваць вынік праверкі подпісу ва ўсплываючым вакне"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Часова захоўваць парафразу ў памяці"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Спыніць дзеянне пасля"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "мінут(а) "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Выстаўленне ў '0' мусіць захоўваць парафразу на ўвесь час сесіі."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Захопліваць увод падчас уводу парафразы"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Паказваць папярэджанне пры старце, калі GnuPG не працуе"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Заўжды адкрываць паведамленні ў зводцы па выбары"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Адкрываць першае нечытанае паведамленне па адкрыцці каталога"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Памятаваць апошняе вылучанае паведамленне"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Пазначаць паведамленне чытаным толькі пры адкрыцці ў новым вакне"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Адкрываць Атрыманыя пасля атрымання новай пошты"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Адкрываць Атрыманыя пры запуску"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Неадкладнае выкананне па пераносу ці выдаленню паведамлення"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Калі гэта опцыя выключаная, паведамлення застаецца пазначаным да выканання."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Зрабіць парадак кнопак у адпаведнасці з GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Паказваць іконку ў трэі"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Мінімізаваць у іконку ў трэі"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Пераключаць вакно па кліку на іконцы ў трэі"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Наставіць звязкі клавішаў... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Іншае"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Знешні загад"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Дыялог атрымання"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Паказваць дыялог атрымання"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Заўсёды"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Толькі пры ручным запуску"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Ніколі"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Не паказваць вакно памылкі атрымання"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Закрываць дыялог атрымання па заканчэнні"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Дадаць адрас да прызначэння па двайным кліку"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Пры выхадзе"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Пацвердзіць выхад"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Чысціць сметніцы пры выхадзе"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Спытаць перад ачысткай"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Папярэджваць, калі есць паведамленні ў чарзе"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Знешнія загады  (%s будзе заменена на імя файла / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Веб-браўзер"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Тыповы браўзер)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Ужываць знешнюю праграму для друку"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Ужываць знешнюю праграму для атрымання пошты"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Ужываць знешнюю праграму для адпраўкі"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Уключыць строгі кантроль цэласнасці кэшу зводкі"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5157,275 +5176,275 @@ msgstr ""
 "праграмамі.\n"
 "Гэта опцыя зніжае хуткасць адлюстравання зводкі."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета I/O:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "секунд(ы)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Аўтавыбар (Рэкамендуецца)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-бітны ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Юнікод (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Заходнееўрапейскі (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Заходнееўрапейскі (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Цэнтральнаеўрапейскі (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтыйскі (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтыйскі (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Балтыйскі (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Грэцкі (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арабскі (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Арабскі (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Яўрэйскі (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Яўрэйскі (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турэцкі (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кірыліца (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кірыліца (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кірыліца (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кірыліца (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японскі (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Японскі (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Японскі (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрошчаны кітайскі (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Спрошчаны кітайскі (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Традыцыйны кітайскі (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традыцыйны кітайскі (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Кітайскі (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Карэйскі (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Тайскі (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Тайскі (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "скарочаная поўная назва дня тыдня"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "поўная назва дня тыдня"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "скарочаная назва месяца"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "поўная назва месяца"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "пераважныя дата i час для бягучай лакалі"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "нумар веку (год/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "дзень месяца як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "гадзіна як лічба дзесятковая ужываючы 24-гадзінны фармат"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "гадзіна як лічба дзесятковая ужываючы 12-гадзінны фармат"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "дзень году як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "месяц як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "мінута як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "альбо AM альбо PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "секунда як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "дзень тыдня як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "пераважная дата для бягучай лакалі"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "апошнія дзве лічбы году"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "год як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "часавы пояс - назва ці скарот"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Вызначальнік"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Апісанне"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Прыклад"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Наставіць колеры паведамлення"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Колеры"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Цытаваны тэкст - узровень першы"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Цытаваны тэкст - узровень другі"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Цытаваны тэкст - узровень трэці"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Спасылка URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Паўтор колераў цытавання"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Выберыце колер для першага узроўню цытавання"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Выберыце колер для другога узроўню цытавання"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Выберыце колер для трэцяга узроўню цытавання"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Выберыце колер для URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Апісанне сімвалаў"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5449,11 +5468,11 @@ msgstr ""
 "Групы навін\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Паказваць expr калі заданы x"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5467,7 +5486,7 @@ msgstr ""
 "Цела цытаванага паведамлення без подпісу\n"
 "Літэрал %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5479,19 +5498,19 @@ msgstr ""
 "Літэрал дужка фігурная адкрываючая\n"
 "Літэрал дужка фігурная закрываючая"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Звязкі клавіш"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Выберыце набор звязак клавішаў."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Тыповыя"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Стары Сільфід"
 
diff --git a/po/bg.po b/po/bg.po
index 4d03e0d1..a5f1c917 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Папка"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -829,7 +829,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
@@ -851,8 +851,8 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
@@ -917,7 +917,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -931,12 +931,12 @@ msgstr "/_Инструменти/Внасяне на _LDIF файл"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -954,7 +954,7 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -984,7 +984,7 @@ msgstr "/_Редактиране/_Вмъкване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1168,7 +1168,7 @@ msgstr "Грешка при конвертиране на адресната к�
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -1214,7 +1214,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1269,402 +1269,411 @@ msgstr "Кафяв"
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Притурки"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1672,25 +1681,25 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1701,12 +1710,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1715,15 +1724,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1732,95 +1741,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1830,52 +1839,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2058,7 +2067,7 @@ msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2366,7 +2375,7 @@ msgstr "Възобновяване на дървото на папката пр�
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4153,21 +4162,21 @@ msgstr "Предпочитания за акаунт"
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
@@ -4175,7 +4184,7 @@ msgstr "Неприкосновеност"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Напреднал"
 
@@ -4303,7 +4312,7 @@ msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -4353,8 +4362,8 @@ msgstr "Генериране на Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Редактиране... "
 
@@ -4380,7 +4389,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Удостоверяване с POP3 преди изпращане"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Сигнатура"
@@ -4693,88 +4702,88 @@ msgstr "Изтриване на действие"
 msgid "Do you really want to delete this action?"
 msgstr "Желаете ли изтриване на действието?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Създаване на прозорец за общи предпочитания...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Общи Предпочитания"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Дисплей"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Автоматично проверяване за нова поща"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "всеки"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "минута(и)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Проверка за нова поща при стартиране"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Обновяване на всички локални папки след приемане"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Приемане от спул"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Филтриране при приемане"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Запазване на изпратените съобщения в Изпратени"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Преносно кодиране"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4783,196 +4792,206 @@ msgstr ""
 "Укажете Преносно Кодиране на Съдържанието(Content-Transfer-Encoding)\n"
 "използвано когато тялото на съобщението съдържа не-ASCII знаци."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Изходяща кодова таблица"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Изходяща кодова таблица"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Главни"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Разделител на сигнатурата"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Автоматично вмъкване"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Автоматично избиране на акаунт за отговор"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Цитиране на съобщението при отговаряне"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Бутона за отговор изпълнява отговор до пощенски списък"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Автоматично стартиране на външен редактор"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Ниво на отмяна"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Пренасяне на съобщенията на"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "знака"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Пренасяне на цитат"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Пренасяне при въвеждане"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Запазване в папката с чернови"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Нормална"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Формат на отговора"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Маркиране на цитат"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Формат на препращане"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Описание на символите "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Входяща кутия"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Текст"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Съкращаване на новинарски групи по дълги от"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "букви"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Изглед на извадката"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Развиване на нишките..."
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Формат на датата"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr "Определяне на атрибути на извадката"
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Съобщение"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4981,11 +5000,11 @@ msgstr ""
 "Ако е избрано `Автоматично', ще бъде избрано\n"
 "оптималното за текущия локал кодиране."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Позволяване на оцветяване на съобщение"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4993,597 +5012,597 @@ msgstr ""
 "Показване на multi-byte азбука и цифри като\n"
 "ASCII знаци (само за Японски)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Панел със заглавна част над изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Разстояние м/у редовете"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "пиксел(а)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Превъртане"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Половин страница"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Плавно превъртане"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Стъпка"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Разпъване на прикрепени изображения"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Настройка на показваните заглавки части"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Изберете ключове"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Изтриване на папка"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Изтриване на папка"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Автоматична проверка на подписите"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Временно съхраняване на паролата в паметта"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Невалидно след"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "минута(и)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Установяване на `0' ще съхранява паролата\n"
 "през цялата сесия)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Прехващане на входа при въвеждане на парола"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Отваряне винаги на съобщенията избрани в извадката"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Влизане във входящата кутия след получаване на нови съобщения"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Проверка за нова поща при стартиране"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Съобщенията ще бъдат маркирани до изпълнението\n"
 "ако това е изключено)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Екранно Име"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Други"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Диалог при получаване"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Показване на диалог при получаване"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Винаги"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Никога"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Без повдигане на диалог за грешка при грешка при получаване"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Затваряне на диалога при получаване когато завърши"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Добавяне на адреса в назначението при двойно щракване"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "При излизане"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Потвърждение при излизане"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Изчистване на Кошчето на излизане"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Питане преди изчистване"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Предупреждение ако има съобщения в опашката"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Входяща кутия"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Използване на външна програма за приемане"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Просрочка на В/И порт:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "секунда(и)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Автоматично (Препоръчително)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Западно европейски (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Централно европейски (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийски (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилица (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилица (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японски (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Японски (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Японски (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционен китайски (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционен китайски (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайски (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Корейски (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Тайландски (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Тайландски (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "напълно съкратеното име на делника"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "пълното име на делника"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "съкратеното име на месеца"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "пълното име на месеца"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "предпочитаната дата и час за текущия локал"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "век (годинa/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "денят от месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часа като десетично число ползвайки 24-часов часовник"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часа като десетично число ползвайки 12-часов часовник"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "деня от годината като десетично число"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "минутата като десетично число"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "или AM или PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "секундата като десетично число"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "деня от седмицата като десетично число"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "предпочитаната дата за текущия локал"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "последните две цифри от годината"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "годината като десетично число"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "времевата зона или име или съкращение"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Идентификатор"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Цитиран Текст - Първо Ниво"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Цитиран Текст - Второ Ниво"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Цитиран Текст - Трето Ниво"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI връзка"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Преизползване на цветовете за цитат"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Изберете цвят за цитат първо ниво"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Изберете цвят за цитат второ ниво"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Изберете цвят за цитат трето ниво"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Изберете цвят за URL"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Описание на символите"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5607,11 +5626,11 @@ msgstr ""
 "Новинарски групи\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Ако x е установен, показва expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5625,7 +5644,7 @@ msgstr ""
 "Цитирано тяло на съобщение без подпис\n"
 "Символ %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5637,20 +5656,20 @@ msgstr ""
 "Символ отваряща къдрава скоба\n"
 "Символ затваряща къдрава скоба"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Стар Sylpheed"
 
diff --git a/po/cs.po b/po/cs.po
index a5e36e00..be21053c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+0900\n"
 "PO-Revision-Date: 2008-01-19 00:11+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -509,11 +509,11 @@ msgstr "Nalezeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavení je uloženo.\n"
 
-#: libsylph/prefs_common.c:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Filtr nevyžádané pošty (ruční)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -834,7 +834,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
@@ -855,8 +855,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
@@ -921,7 +921,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -934,12 +934,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -985,7 +985,7 @@ msgstr "/_Vložit"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adresář"
 
@@ -1155,7 +1155,7 @@ msgstr "Chyba při konverzi adresáře"
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Rozhraní"
 
@@ -1201,7 +1201,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1256,360 +1256,369 @@ msgstr "Hnědá"
 msgid "None"
 msgstr "Nespecifikováno"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Odeslat"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Soubor/Odesla_t později"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Soubor/Uložit do složky _konceptů"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Soubor/Uložit a pok_račovat v úpravě"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Přiložit soubor"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit podpi_s"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Soubor/Připo_jit podpis"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/Za_rovnat aktuální odstavec"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zar_ovnat všechny dlouhé řádky"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/A_utomatické zarovnávání"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Příjemce"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/_Odesílatel"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/S_krytá kopie"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/Z_obrazit/Odpovědi z_aslat na"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/Z_obrazit/Odpovědi _vystavit na"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Z_obrazit/Up_ravit nástrojovou lištu..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Znaková _sada"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Z_obrazit/Znaková _sada/_Automaticky rozpoznat"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Znaková _sada/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/Znaková _sada/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/Znaková _sada/Tradiční čínština (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/Znaková _sada/Korejština (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/Adresá_ř"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Nástroje/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/Podepsat P_GP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Nástroje/Ši_frovat PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/Kontrolovat pravopi_s"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Přílohy"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1617,26 +1626,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1647,11 +1656,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1664,15 +1673,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1686,93 +1695,93 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1781,48 +1790,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -2003,7 +2012,7 @@ msgstr "Upravit záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2304,7 +2313,7 @@ msgstr "Obnova stromu složek se nezdařila."
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťují se nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Nevyžádaná"
 
@@ -4058,21 +4067,21 @@ msgstr "Nastavení účtu"
 msgid "Creating account preferences window...\n"
 msgstr "Vytváří se okno nastavení účtu...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Soukromí"
 
@@ -4080,7 +4089,7 @@ msgstr "Soukromí"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Rozšířené"
 
@@ -4204,7 +4213,7 @@ msgid "Authentication method"
 msgstr "Metoda autentizace"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automaticky rozpoznat"
 
@@ -4248,8 +4257,8 @@ msgstr "Generovat ID zprávy"
 msgid "Add user-defined header"
 msgstr "Přidávat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Upravit... "
 
@@ -4274,7 +4283,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace s POP3 před odesláním"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Podpis"
@@ -4582,85 +4591,85 @@ msgstr "Smazat akci"
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete smazat tuto akci?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Vytváří se okno společných nastavení...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Společná nastavení"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Zobrazení"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Nevyžádaná pošta"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Detaily"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automaticky kontrolovat novou poštu"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "každých"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minut"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Kontrolovat novou poštu při spuštění"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Po přijmutí aktualizovat všechny místní složky"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Vykonávat příkaz ihned při přijmutí nových zpráv"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "\"%d\" bude nahrazeno počtem nových zpráv."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Začleňovat z místního proměnlivého úložiště"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrovat při začlenění"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Cesta k proměnlivému úložišti"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Ukládat odeslané zprávy do složky Odeslaná pošta"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Používat pravidla filtrů na odeslané zprávy"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4668,15 +4677,15 @@ msgstr ""
 "Určí, jaké kódování přenosu bude použito, obsahuje-li tělo zprávy znaky mimo "
 "rozsah ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Kódování názvu souboru MIME"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Záhlaví MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4686,172 +4695,182 @@ msgstr ""
 "Záhlaví MIME: nejpoužívanější, ale porušuje RFC 2047.\n"
 "RFC 2231: vyhovuje standardům, ale nepoužívané."
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Obecné"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Vkládat automaticky"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Při odpovídání automaticky vybírat účet"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citovat zprávy při odpovídání"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko s odpovědí zvolí odpověď elektronické konferenci"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Dědit příjemce u odpovědi na vlastní zprávy"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spouštět externí editor"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Zarovnávat zprávu na"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Zalamovat citaci"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Zalamovat při vkládání"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Automaticky ukládat do složky konceptů"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Formát"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Kontrola pravopisu"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Formát odpovědi"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Uvozovací znak"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Formát předání"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Popis symbolů "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Zapnout kontrolu pravopisu"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Výchozí jazyk:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Písmo textu"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Strom složek"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Zobrazovat počet nepřečtených zpráv za názvem složky"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Zobrazovat sloupce s počtem zpráv ve stromu složek"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Zkracovat názvy diskusních skupin delší než"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "znaků"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Souhrn zpráv"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Zobrazovat příjemce ve sloupci \"Odesílatel\", jestliže jste odesílatelem"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Rozbalovat vlákna"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Formát data"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Nastavení zobrazovaných položek v souhrnu... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Výchozí znaková sada"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Použije se při zobrazení zpráv bez určené znakové sady."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Znaková sada při odesílání"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4859,11 +4878,11 @@ msgstr ""
 "Pokud je zvoleno \"Automatická\", bude použita nejvhodnější znaková sada pro "
 "lokalizaci libc."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Povolit obarvení textu ve zprávách"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4871,83 +4890,83 @@ msgstr ""
 "Zobrazovat vícebajtovou abecedu a číslice\n"
 "jako znaky ASCII (pouze pro japonštinu)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Zobrazovat pole se záhlavím nad zprávou"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Zobrazovat krátké záhlaví při zobrazení zprávy"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Zobrazovat HTML jako prostý text"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 msgid "Treat HTML only messages as attachment"
 msgstr "Považovat zprávy obsahující pouze HTML za přílohu"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Ukazovat kurzor při zobrazení zpráv"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Prázdná řádka"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixelů"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Polovina stránky"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Jemný posun"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Obrázky"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Měnit velikost přiložených obrázků tak, aby se vešly do okna"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Zobrazovat obrázky v těle zprávy"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Zapnout kontrolu nevyžádané pošty"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Učit se příkazem:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Vybrat předvolby)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Vyžádaná pošta"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Příkaz k třídění"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4955,205 +4974,205 @@ msgstr ""
 "Aby mohla být nevyžádaná pošta automaticky rozpoznána, je nutné v určitém "
 "rozsahu ručně zpracovat zprávy nevyžádané i vyžádané."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Složka nevyžádané pošty"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Zprávy označené jako nevyžádaná pošta budou přesunuty do této složky."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrovat zprávy vyhodnocené jako nevyžádané při přijmutí"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrovat nevyžádanou poštu před běžným filtrováním"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Vymazávat nevyžádanou poštu ze serveru při příjmu"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Označovat rozpoznanou nevyžádanou poštu jako přečtenou"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automaticky kontrolovat podpis"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazovat výsledek kontroly podpisu ve zvláštním okně"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Ukládat heslo dočasně v paměti"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Vyprší za"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minut "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Nastavení na \"0\" uloží heslo během celé relace."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Blokovat vstup při zadávání hesla"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zobrazovat varování, pokud GnuPG není funkční"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Vybrané zprávy vždy otevírat v souhrnu"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Při vstupu do složky otevírat první nepřečtenou zprávu"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Pamatovat si poslední vybranou zprávu"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Označovat zprávu jako přečtenou pouze při otevření v novém okně"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Po přijetí nových zpráv přejít na doručenou poštu"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Otevírat doručenou poštu při spuštění"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonávat ihned při přesunu nebo mazání zpráv"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Pokud je tato volba vypnuta, zprávy budou označeny až do vykonání."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Pořadí tlačítek vyhovující GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Zobrazovat ikonu v oznamovací oblasti"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimalizovat do oznamovací oblasti"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Vyvolávat okno kliknutím na ikonu v oznamovací oblasti"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Ostatní"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Externí příkazy"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Dialog o příjmu"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Zobrazovat dialog o příjmu"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Pouze při ručním příjmu"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Při chybě v příjmu nezobrazovat dialog o chybě"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Zavírat dialog o příjmu po dokončení"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Přidávat adresu do cíle dvojitým kliknutím"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Potvrzovat ukončení"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Vyprazdňovat koš"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Ptát se před vyprázdněním"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Varovat, pokud jsou některé zprávy pozdržené"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externí příkaz (\"%s\" bude nahrazeno názvem souboru nebo URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Výchozí prohlížeč)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Používat externí program při tisku"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Používat externí program při začleňování"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Používat externí program při odesílání"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapnout striktní kontrolu integrity vyrovnávací paměti souhrnu"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5163,275 +5182,275 @@ msgstr ""
 "složek.\n"
 "Tato volba sníží rychlost zobrazování souhrnu."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Časový limit V/V operací se socketem:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "sekund"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatická (doporučeno)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bitový ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Západoevropské jazyky (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Západoevropské jazyky (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Západoevropské jazyky (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Středoevropské jazyky (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltské jazyky (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltské jazyky (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Pobaltské jazyky (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Řečtina (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabština (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabština (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejština (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejština (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turečtina (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilice (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilice (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilice (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilice (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonština (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonština (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonština (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínština (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínština (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korejština (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thajština (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thajština (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "zkratka dne v týdnu"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "zkratka měsíce"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "datum a čas preferovaný aktuální lokalizací libc"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodina jako desítkové číslo s 24hodinovým cyklem"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodina jako desítkové číslo s 12hodinovým cyklem"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "den v roce jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "měsíc jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minuta jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "dopoledne nebo odpoledne"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekunda jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "datum preferované aktuální lokalizací libc"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Specifikátor"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Nastavení barev ve zprávách"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - první úroveň"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - druhá úroveň"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - třetí úroveň"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Odkaz URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Vybrat barvu první úrovně citace"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Vybrat barvu druhé úrovně citace"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Vybrat barvu třetí úrovně citace"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Vybrat barvu URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5455,11 +5474,11 @@ msgstr ""
 "Diskusní skupiny\n"
 "ID zprávy"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Pokud je zadáno \"x\", zobrazí se \"expr\""
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5473,7 +5492,7 @@ msgstr ""
 "Citované tělo zprávy bez podpisu\n"
 "Znak procento"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5485,19 +5504,19 @@ msgstr ""
 "Znak levá složená závorka\n"
 "Znak pravá složená závorka"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Vyberte prosím předvolby klávesových zkratek."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Starý Sylpheed"
 
diff --git a/po/da.po b/po/da.po
index d5990a93..a82c862c 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Mappe"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -833,7 +833,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
@@ -855,8 +855,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
@@ -921,7 +921,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -935,12 +935,12 @@ msgstr "/_Funktioner/Importer _LDIF-Fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -958,7 +958,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +988,7 @@ msgstr "/_Redigér/_Sæt ind"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -1166,7 +1166,7 @@ msgstr "Adressebog konverterings fejl"
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Brugerflade"
 
@@ -1212,7 +1212,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Note"
 
@@ -1267,402 +1267,411 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Vedhæftet"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1670,25 +1679,25 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1699,12 +1708,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1713,15 +1722,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1730,95 +1739,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1828,52 +1837,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2056,7 +2065,7 @@ msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2365,7 +2374,7 @@ msgstr "Gendanner mappe træ..."
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4156,21 +4165,21 @@ msgstr "Konto opsæt"
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Send"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Opret"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privat"
 
@@ -4178,7 +4187,7 @@ msgstr "Privat"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avanceret"
 
@@ -4306,7 +4315,7 @@ msgid "Authentication method"
 msgstr "Godkendelses metode"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -4353,8 +4362,8 @@ msgstr "Opret meddelelses ID"
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Redigér... "
 
@@ -4380,7 +4389,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 før afsendelse"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Underskrift"
@@ -4693,88 +4702,88 @@ msgstr "Slet handling"
 msgid "Do you really want to delete this action?"
 msgstr "Vil du virkelig slette denne handling?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Opretter generelt opsæt vindue...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Generelt opsæt"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Vis"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automatisk hentning af ny post"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "hver"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Hent e-post ved programstart"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Opdater alle mapper efter modtagelse"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Modtager fra lokal spool"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filter ved modtagelse"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Gem sendte meddelelser i Sendt"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Kodning af overførsel"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4783,196 +4792,206 @@ msgstr ""
 "Angiv Content-Transfer-Encoding anvendt hvis\n"
 "besked inholder andet end ASCII tegn."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Udgående tegnsæt"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Udgående tegnsæt"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Generel"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Underskriftsdeling"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Tilføj automatisk"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Vælg automatisk konto ved besvarelse"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citat af meddelelse i svar"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Svar knap starter svar til mail liste"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Start automatisk ekstern editor"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Fortryd niveauer"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Del linier ved"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "tegn"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Del citat linier"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Del ved indtastning"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Gem i Kladde"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Svar format"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Citat tegn"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Videresend format"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Beskrivelse af symboler "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Standard underskriftsnøgle"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Forkort nyhedsgruppe længere end"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "bogstaver"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Meddelelses visning"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Vis modtager i `Fra' hvis du er afsender"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Åbn tråde"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Dato format"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Vælg oplysninger i oversigt... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Meddelelse"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4981,11 +5000,11 @@ msgstr ""
 "Hvis `Automatisk' er valgt benyttes det optimale\n"
 "tegnsæt for den valgte locale."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Benyt farver i meddelelser"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4993,595 +5012,595 @@ msgstr ""
 "Vis 2-byte alfabet og tal som ASCII\n"
 "tegn (kun japansk)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Vis hoved linier over meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Linie afstand"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "punkter"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Scrol"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Blød scroll"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Skrift"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Ændre størrelse på vedhæftede billeder"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Hoved opsæt"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vælg nøgle"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Slet mappe"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Slet mappe"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Check signatur automatisk"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Vis signatur check resultat i separat vindue"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Udløb efter"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Sæt til '0' vil gemme adgangssætningen\n"
 " for hele sessionen)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Overtag indtastning mens adgangssætning indtastes"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Advarsel ved start hvis GnuPG ikke virker"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Markér kun meddelelser som læst hvis åbnet i nyt vindue"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Gå til Indbakke efter modtagelse af ny post"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Hent e-post ved programstart"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(Ellers markéres meddelelese indtil der vælges 'Udfør')"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Vis navn"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Anden"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Altid"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke fejlmeddelelse ved fejl"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Luk modtag vindue efter overførsel"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Ved afslut"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Spørg ved afslut"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Tøm Slettet ved afslut"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Spørg før tømning"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Advar ved meddelelser i kø"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Standard indbakke"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Benyt eksternt program til modtagelse af e-post"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Skriver oversigt (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Anbefalet)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "kort måneds navn"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "måneds navn"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "århundrede (år/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dag i måned som tal"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "århundrede som tal"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "måned som tal"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i året"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "året som tal"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Vælger"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Vælg farve for nivau 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Vælg farve for nivau 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Vælg farve for nivau 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Vælg farve for URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5605,11 +5624,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5623,7 +5642,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5635,20 +5654,20 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
diff --git a/po/de.po b/po/de.po
index bd1ce40c..df06af92 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Manueller Spam-Mail Filter"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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 "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
@@ -853,8 +853,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -873,21 +873,21 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
@@ -919,7 +919,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -932,12 +932,12 @@ msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -955,7 +955,7 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -983,7 +983,7 @@ msgstr "/_Einfügen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -1160,7 +1160,7 @@ msgstr "Adressbuch-Konvertierungsfehler"
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
@@ -1206,7 +1206,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1261,360 +1261,369 @@ msgstr "Braun"
 msgid "None"
 msgstr "Keine"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/In Ent_wurfablage speichern"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ansicht/_Werkzeugliste anpassen..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschlüsseln"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Anhänge"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1622,25 +1631,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1651,11 +1660,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1668,15 +1677,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1690,93 +1699,93 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1785,48 +1794,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2006,7 +2015,7 @@ msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2307,7 +2316,7 @@ msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Spam"
 
@@ -4061,21 +4070,21 @@ msgstr "Accounteinstellungen"
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Senden"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privat"
 
@@ -4083,7 +4092,7 @@ msgstr "Privat"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Speziell"
 
@@ -4208,7 +4217,7 @@ msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -4253,8 +4262,8 @@ msgstr "Erzeuge Nachrichten-ID"
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
@@ -4279,7 +4288,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Unterschrift"
@@ -4585,86 +4594,86 @@ msgstr "Aktion löschen"
 msgid "Do you really want to delete this action?"
 msgstr "Wollen Sie diese Aktion wirklich löschen?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Erstelle Allgemeine-Einstellungenfenster...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Spam-Mail"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Details"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automatische Aktualisierung"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "alle"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Hole neue E-Mail beim Programmstart"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Aktualisiere alle lokalen Ablagen nach dem Empfang"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr ""
 "Ausführen des folgenden Befehls, wenn neue Nachrichten empfangen wurden"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Befehl"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "'%d' wird ersetzt durch die Anzahl der neuen Nachrichten."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Übernehme Mails aus lokaler Mailboxdatei"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtern beim Empfang"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Pfad zur Mailboxdatei"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Gesendete Nachrichten in Gesendet-Ablage speichern"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Anwenden des Filters beim Versenden von Nachrichten"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Übertragungscodierung"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4672,15 +4681,15 @@ msgstr ""
 "Geben Sie den Übertragungs-Zeichensatz für den Nachrichteninhalt an, falls "
 "dieser Nicht-ASCII-Zeichen enthält."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "MIME Dateinamenkodierung"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME Kopfzeile"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4691,171 +4700,181 @@ msgstr ""
 "MIME Kopfzeile: am meisten verbreitet, verletzt aber RFC 2047\n"
 "RFC 2231: entspricht dem Standard, ist aber nicht sehr verbreitet"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Allgemein"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Automatisch einfügen"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Wähle automatisch den Account für die Antworten"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Zitiere Nachricht in der Antwort"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwort-Knopf führt Antwort an Mailing-Liste aus"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Übernehme Empfänger bei Nachrichten an mich selbst"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Starte externen Editor automatisch"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Schritte, die rückgängig gemacht werden können"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "Zeichen"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Bei der Eingabe umbrechen"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Automatisch als Entwurf speichern"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Format"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Rechtschreibprüfung"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Antwort-Format"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Weiterleiten-Format"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Rechtschreibprüfung aktivieren"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Standard-Sprache"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Standardschriftart"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Ordneransicht"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Zeige Nachrichtenanzahl in der Ordneransicht"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Kürze Newsgroups länger als"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "Zeichen"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Ablageninhaltsansicht"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Setze Ablageninhalt-Einträge... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Standard-Zeichensatz"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Dies wird für Nachrichten mit fehlender Zeichenkodierung verwendet."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Standard-Zeichensatz beim Versenden"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4863,11 +4882,11 @@ msgstr ""
 "Wenn 'Automatisch' gewählt ist, wird der optimale Zeichensatz für die "
 "aktuelle Locale-Einstellung benutzt."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4875,84 +4894,84 @@ msgstr ""
 "Stelle Mehr-byte Alphabet und Zahlen als\n"
 "ASCII-Zeichen dar (nur Japanisch)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Wandle HTML Nachrichten um in Nur-Text"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Wandle HTML Nachrichten um in Nur-Text"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Zeige Cursor in der Nachrichtenansicht an"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Zeilenabstand"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Rollen"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Halbe Seite"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Schritt"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Große angehängte Bilder in das Fenster einpassen"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Zeige Bilder eingebettet an"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Aktiviere Spam-Mail Kontrolle"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Befehle zum Lernen:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Wähle Voreinstellung)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Kein Spam"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Klassifizier-Befehl"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4960,217 +4979,217 @@ msgstr ""
 "Um Spam-Mails automatisch zu klassifizieren, müssen sowohl Spam- als auch "
 "Nicht-Spam-Mails eine Wile manuell gelernt werden."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Spam-Mail Ablage"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Nachrichten, die als Spam-Mails markiert wurden, werden in diese Ablage "
 "verschoben."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr ""
 "Nachrichten beim Empfang ausfiltern, wenn sie als Spam-Mails erkannt wurden"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Spam-Mails vor dem eigentlichen Filtern aussortieren"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Spam-Mails während des Empfangens entfernen"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Markiere gefilterte Spam-Mails als gelesen"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr ""
 "Zeige das Ergebnis der Überprüfung der digitalen Unterschrift in einem POPUP-"
 "Fenster an"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantra zeitweise speichern"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Läuft aus nach"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "Minute(n)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "('0' speichert das Mantra für die gesamte\n"
 "Sitzung)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Nachrichten immer in der Zusammenfassung öffnen, wenn ausgewählt"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr ""
 "Öffne erste ungelesene Nachricht anzeigen beim Öffnen eines Verzeichnis"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Letzte geöffnete Nachricht merken"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster geöffnet "
 "werden"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Posteingang nach dem Empfang neuer E-Mail öffnen"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Öffne Posteingang beim Programmstart"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Nachricht wird markiert bis zur Ausführung,\n"
 " wenn dies ausgeschaltet ist)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordnen der Buttons kompatibel zu GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Systemablagesymbol (Tray-Icon) anzeigen "
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Sylpheed zu einem Symbol in der Systemleiste minimieren"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Fenster bei Trayicon-Klick wechseln"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Tastenkombinationen wählen... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Weiteres"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Externe Befehle"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Empfangen-Dialog"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Zeige Empfangen-Dialog"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Immer"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nie"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Empfangen-Dialog schließen nach Beendigung"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Beim Beenden"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Standardbrowser)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Benutze externes Programm zum Drucken"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Benutze externes Programm, um E-Mails zu empfangen"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Benutze externes Programm zum Senden"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Aktiviere strengen Integritätstest des Summen-Zwischenspeichers"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5180,275 +5199,275 @@ msgstr ""
 "Inhalt von Ablagen verändern könnten.\n"
 "Diese Option verringert die Performance der Summen-Anzeige."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Western European (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Baltisch (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebräisch (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebräiisch (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Einfaches Chinesisch (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "gekürzter Wochentagsname"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "gekürzter Monatsname"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abkürzung"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5472,11 +5491,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5490,7 +5509,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "Wörtlich %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5502,19 +5521,19 @@ msgstr ""
 "öffnende Klammer\n"
 "schließende Klammer"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Voreingestellte Tastenkombinationen wählen."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
diff --git a/po/el.po b/po/el.po
index ab7dc395..a459f5cb 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χειροκίνητο)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -845,7 +845,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
@@ -866,8 +866,8 @@ msgstr "/_Αρχείο/Νέο _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -886,21 +886,21 @@ msgstr "/_Αρχείο/_Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
@@ -932,7 +932,7 @@ msgstr "/_Διεύθυνση/_Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
@@ -946,12 +946,12 @@ msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
@@ -969,7 +969,7 @@ msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -997,7 +997,7 @@ msgstr "/Ε_πικόλληση"
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -1185,7 +1185,7 @@ msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίο�
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Διεπαφή"
 
@@ -1233,7 +1233,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1289,362 +1289,371 @@ msgstr "Καφέ"
 msgid "None"
 msgstr "Κανένα"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Προσθήκη..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Διαγραφή"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Ιδιότητες..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Αρχείο/Απο_στολή"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Αρχείο/Αποστο_λή αργότερα"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Αρχείο/Αποθήκευση στον φάκελο _πρόχειρα"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Αρχείο/Αποθήκευση και _συνέχεια επεξεργασίας"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Αρχείο/Επισύνα_ψη αρχείου"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Αρχείο/Ε_ισαγωγή αρχείου"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Αρχείο/Εισαγωγή υπο_γραφής"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Αρχείο/Επισύναψη υπογ_ραφής"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Επεξεργασία/Α_ναίρεση"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Επεξεργασία/Επανά_ληψη"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Επεξεργασία/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Επεξεργασία/Απο_κοπή"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Επεξεργασία/Eπικόλληση ως πα_ράθεση"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Επεξεργασία/Επιλ_ογή όλων"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Επεξεργασία/Ανα_δίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Επεξεργασία/Αναδίπλωση μακρών _γραμμών"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αυτό_ματη αναδίπλωση"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Προβολή"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Προβολή/_Προς"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Προβολή/_Κοινοποίηση"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Προβολή/Κ_ρυφή κοινοποίηση"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Προβολή/_Απάντηση σε"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Προβολή/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Προβολή/_Συνέχεια προς"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Προβολή/_Χάρακας"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Προβολή/Σ_υνημμένου"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Προβολή/Προσαρμογή ε_ργαλειοθήκης..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ελληνικά (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Τούρκικη (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Εργαλεία/_Ευρετήριο διευθύνσεων"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Εργαλεία/_Πρότυπο"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Εργαλεία/Ε_νέργειες"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Εργαλεία/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Εργαλεία/Επεξεργασία με ε_ξωτερικό πρόγραμμα"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Εργαλεία/_Υπογραφή με PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Ε_πιλογές/_Κρυπτογράφηση με PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Συνημμένα"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,28 +1661,28 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,11 +1693,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,15 +1710,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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,96 +1732,96 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1822,49 +1831,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2046,7 +2055,7 @@ msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2352,7 +2361,7 @@ msgstr "Η επαναδημιουργία της λίστας φακέλων α�
 msgid "Checking for new messages in all folders..."
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
@@ -4129,21 +4138,21 @@ msgstr "Προτιμήσεις λογαριασμού"
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργία παράθυρου προτιμήσεων λογαριασμού...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Απόρρητο"
 
@@ -4151,7 +4160,7 @@ msgstr "Απόρρητο"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Προχωρημένες"
 
@@ -4275,7 +4284,7 @@ msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Αυτόματη"
 
@@ -4321,8 +4330,8 @@ msgstr "Δημιουργία Message-ID"
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Επεξεργασία... "
 
@@ -4347,7 +4356,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Yπογραφή"
@@ -4655,87 +4664,87 @@ msgstr "Διαγραφή ενέργειας"
 msgid "Do you really want to delete this action?"
 msgstr "Θέλετε σίγουρα να διαγράψετε αυτή την ενέργεια;"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Δημιουργία παράθυρου κοινών προτιμήσεων...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Κοινές προτιμήσεις"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Εμφάνιση"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Αυτόματος έλεγχος για νέα μηνύματα"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "κάθε"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "λεπτά"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Έλεγχος για νέα μηνύματα στην αρχή"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 #, fuzzy
 msgid "Update all local folders after incorporation"
 msgstr "Ανανέωση όλων των τοπικών φακέλων μετά τη λήψη"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Εκτέλεση εντολής στη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Εντολή"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "το `%d' θα αντικατασταθεί με τον αριθμό των νέων μηνυμάτων."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Ενσωμάτωση από την τοπική ουρά"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 #, fuzzy
 msgid "Filter on incorporation"
 msgstr "Φίλτρο βάση _Παραληπτών..."
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Διαδρομή ουράς εκτύπωσης"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Αποθήκευση σταλμένων μηνυμάτων στον φάκελο Σταλμένα"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Εφαρμογή φίλτρου στα απεσταλμένα μηνύματα"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Κωδικοποίηση μεταφοράς"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4743,189 +4752,199 @@ msgstr ""
 "Ορίστε την κωδικοποίηση μεταφοράς περιεχομένου που θα χρησιμοποιηθεί όταν το "
 "σώμα του μηνύματος περιέχει χαρακτήρες μη-ASCII"
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Κωδικοποίηση ονομάτων αρχείων MIME"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Κεφαλίδα MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Γενικές"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Διαχωρισμός υπογραφής"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Αυτόματη εισαγωγή"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Αυτόματη επιλογή λογαριασμού στις απαντήσεις"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Παράθεση μηνύματος κατά την απάντηση"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Με το κουμπί απάντηση απαντάμε στη λίστα ταχυδρομείου"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Διαδοχή παραληπτών στην απάντηση των δικών σας μηνυμάτων"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Επεξεργαστής κειμένου"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Αυτόματη εκτέλεση εξωτερικού συντάκτη κειμένου"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Επίπεδο αναίρεσης"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Αναδίπλωση μηνυμάτων στους"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "χαρακτήρες"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Αναδίπλωση παράθεσης"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Αναδίπλωση κατά την εισαγωγή"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Αυτόματη αποθήκευση στα πρόχειρα"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Μορφοποίηση"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Έλεγχος ορθογραφίας"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Μορφή απάντησης"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Σήμα παράθεσης"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Μορφή προώθησης"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Περιγραφή των συμβόλων "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Ενεργοποίηση ορθογράφου"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Προεπιλεγμένη γλώσσα:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Γραμματοσειρά κειμένου"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Προβολή φακέλων"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του φακέλου"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του φακέλου"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 #, fuzzy
 msgid "Abbreviate newsgroups longer than"
 msgstr "Σύντμηση ονομάτων ομάδων συζητήσεων που είναι μακρύτερα από"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "χαρακτήρες"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Προβολή περιλήψεων"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Εμφάνιση παραλήπτη στη στήλη 'Από' αν αποστολέας είστε εσείς"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Επέκταση νημάτων"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 #, fuzzy
 msgid " Set display item of summary... "
 msgstr "Ορισμός εικονιδίου για προβολή"
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Χρησιμοποιείται όταν προβάλλονται μηνύματα που δεν έχουν κωδικοποίηση."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Κωδικοποίηση χαρακτήρων εξερχομένων"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4933,95 +4952,95 @@ msgstr ""
 "Αν επιλεγεί 'Αυτόματη', θα χρησιμοποιηθεί η βέλτιστη κωδικοποίηση για την "
 "τρέχουσα τοπική ρύθμιση"
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Απεικόνιση των HTML μηνυμάτων σαν κείμενο"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Απεικόνιση των HTML μηνυμάτων σαν κείμενο"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως εικονίδια"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Διάστημα γραμμών"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "εικονοστοιχείο(α)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Κύλιση"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Μισή σελίδα"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Ομαλή κύλιση"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Κατά βήματα"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Εικόνες"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Αυτόματη προσαρμογή των συνημμένων εικόνων"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Εμφάνιση εικόνων μέσα στο μήνυμα."
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Ενεργοποίηση ελέγχου ανεπιθύμητης αλληλογραφίας"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Εντολή εκμάθησης:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(επιλογή πρότυπου)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Επιθυμητή αλληλογραφία"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Εντολή ταξινόμησης"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5029,492 +5048,492 @@ msgstr ""
 "Για να γίνει δυνατή η αυτόματη αναγνώριση της ανεπιθύμητης αλληλογραφίας, θα "
 "πρέπει να γίνει χειροκίνητη εκμάθηση ως ένα σημείο."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Φάκελος ανεπιθύμητης αλληλογραφίας"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Τα μηνύματα που έχουν σημειωθεί ως ανεπιθύμητη αλληλογραφία θα μετακινηθούν "
 "σε αυτό το φάκελο."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Φιλτράρισμα ανεπιθύμητης αλληλογραφίας πριν τα κανονικά φίλτρα"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Σημείωση των φιλτραρισμένων ανεπιθύμητων μηνυμάτων ως αναγνωσμένα"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Αυτόματος έλεγχος υπογραφών"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Εμφάνιση του ελέγχου υπογραφής σε αναδυόμενο παράθυρο"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Προσωρινή αποθήκευση της φράσης πρόσβασης στη μνήμη"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Έληξε μετά"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "λεπτά"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Ορίζοντας το σε '0' η φράση πρόσβασης θα αποθηκεύεται για όλη τη σύνοδο"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Άνοιγμα επιλεγμένου μηνύματος όταν επιλεγεί"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Τα μη φιλτραρισμένα μηνύματα θα αποθηκεύονται σε αυτό τον φάκελο"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "/_Εργαλεία/Φιλτράρισμα ε_πιλεγμένων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Σημείωση ενός μηνύματος ως αναγνωσμένου μόνο όταν ανοιχθεί σε νέο παράθυρο"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Άνοιγμα των εισερχομένων μετά τη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Άνοιγμα των εισερχομένων στην αρχή"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Τα μηνύματα θα σημειωθούν μέχρι την εκτέλεση αν αυτό είναι αποεπιλεγμένο"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Συμμόρφωση της σειράς των κουμπιών με το GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Προβολή εικονιδίου συρταριού"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Ελαχιστοποίηση στο εικονίδιο συρταριού"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Ορισμός συντομεύσεων πληκτρολογίου... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Άλλα"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Εξωτερικές εντολές"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Διάλογος λήψης"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Προβολή διαλόγου λήψης"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Πάντα"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Μόνο στη χειροκίνητη λήψη"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Ποτέ"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Να μην εμφανίζεται διάλογος στα σφάλματα λήψης"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Κλείσιμο του διαλόγου λήψης όταν ολοκληρωθεί"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Κατά την έξοδο"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Επιβεβαίωση εξόδου"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Επιβεβαίωση πριν το άδειασμα"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Εξωτερικές εντολές (το %s θα αντικατασταθεί με το όνομα αρχείου / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Περιηγητής ιστοσελίδων"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Προεπιλεγμένος περιηγητής)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Χρήση εξωτερικού προγράμματος για εκτύπωση"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 #, fuzzy
 msgid "Use external program for incorporation"
 msgstr "Χρήση εξωτερικού προγράμματος για λήψη μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 #, fuzzy
 msgid "Socket I/O timeout:"
 msgstr "Λήξη ορίου χρόνου εγγραφής"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "δευτερόλεπτα"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Αυτόματη (Προτεινόμενο)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Δυτικής Ευρώπης (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Βαλτικής (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Βαλτικής (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Βαλτικής (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Αραβική (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Αραβική (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Εβραϊκή (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Εβραϊκή (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Τουρκική (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Κυριλλική (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Κυριλλική (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Κυριλλική (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Ιαπωνέζικη (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Ιαπωνέζικη (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Ιαπωνέζικη (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Παραδοσιακή Κινεζική (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Κινεζική (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Κορεατική (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Ταϊλανδέζικη (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Ταϊλανδέζικη (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "το συντομευμένο όνομα της ημέρας"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "το πλήρες όνομα της ημέρας"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "το συντομευμένο όνομα του μήνα"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "το πλήρες όνομα του μήνα"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "η προτιμητέα ημερομηνία και ώρα για την τρέχουσα ρύθμιση τοπικότητας"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "ο αιώνας (έτος/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός σε 24ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός σε 12ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "η μέρα του χρόνου ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "ο μήνας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "το λεπτό ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "είτε ΠΜ ή ΜΜ"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "τα δύο τελευταία ψηφία του έτους"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "το έτος ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "η ζώνη ώρας ως όνομα ή σύντμηση"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Παράδειγμα"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Ορισμός χρωμάτων μηνύματος"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Παράθεση - Πρώτο επίπεδο"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Παράθεση - Δεύτερο επίπεδο"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Παράθεση - Τρίτο επίπεδο"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Σύνδεσμος URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Ανακύκλωση χρωμάτων παράθεσης"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Χρώμα πρώτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Χρώμα δεύτερου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Χρώμα τρίτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Επιλογή χρώματος για συνδέσμους"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Περιγραφή των συμβόλων"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5538,11 +5557,11 @@ msgstr ""
 "Ομάδες νέων\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Αν έχει οριστεί το x, εμφανίζει expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5556,7 +5575,7 @@ msgstr ""
 "Σώμα παράθεσης μηνύματος χωρίς υπογραφή\n"
 "Κυριολεκτικό %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5564,20 +5583,20 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Συντομεύσεις πληκτρολογίου"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Παρακαλώ επιλέξτε ένα κλειδί για το '%s'"
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Προεπιλεγμένο"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Παλιό Sylpheed"
 
diff --git a/po/es.po b/po/es.po
index 9ecaa05c..e0aafafe 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de correo basura (manual)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -830,7 +830,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
@@ -851,8 +851,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -917,7 +917,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -930,12 +930,12 @@ msgstr "/_Herramientas/Importar fichero _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -953,7 +953,7 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -981,7 +981,7 @@ msgstr "/_Pegar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -1157,7 +1157,7 @@ msgstr "Error en la conversión de la agenda"
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -1203,7 +1203,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1258,360 +1258,369 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichero/Agregar _firma"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Recortar todas las líneas largas"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Followup-To"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/Configurar barra de _herramientas..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ver/Codificación de caract_eres/_Automática"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 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:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 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:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 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:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 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:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 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:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 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:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 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:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Cifrar con PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Herramientas/_Comprobar ortografía"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Adjuntos"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,27 +1628,27 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1650,11 +1659,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1667,15 +1676,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1689,93 +1698,93 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1784,48 +1793,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2005,7 +2014,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2308,7 +2317,7 @@ msgstr "Fallo al reconstruir el árbol de carpetas."
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Basura"
 
@@ -4066,21 +4075,21 @@ msgstr "Preferencias de la cuenta"
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -4088,7 +4097,7 @@ msgstr "Privacidad"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -4212,7 +4221,7 @@ msgid "Authentication method"
 msgstr "Método de autentificación"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automática"
 
@@ -4256,8 +4265,8 @@ msgstr "Generar ID-Mensaje"
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4282,7 +4291,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Firma"
@@ -4590,85 +4599,85 @@ msgstr "Borrar acción"
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Creando ventana de preferencias comunes...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Preferencias comunes"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Ver"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Correo basura"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Detalles"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Comprobar correo nuevo"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "cada"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Comprueba correo nuevo al inicio"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todos las carpetas locales después de incorporar"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Ejecutar orden cuando lleguen nuevos mensajes"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Orden"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "«%d» será reemplazado con el número de nuevos mensajes."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Incorporar del almacén local"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrar al incorporar"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Ruta al almacén"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Guardar mensajes enviados en Salida"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Aplicar las reglas de filtrado a los mensajes enviados"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4676,15 +4685,15 @@ msgstr ""
 "Especificar la codificación de transferencia (Content-Transfer-Encoding) "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Codificación MIME de los nombres de fichero"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Cabecera MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4694,172 +4703,182 @@ msgstr ""
 "Cabecera MIME: más popular, pero viola el RFC 2047\n"
 "RFC 2231: conforme al estándar, pero no tan popular"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Generales"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Separador de firma"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Insertar automáticamente"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente la cuenta para responder"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citar el mensaje al responder"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Heredar la lista de destinatarios al responder a mensajes propios"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Autoguardar a borrador"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Formato"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Comprobación ortográfica"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Formato de reenvío"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Activar comprobación ortográfica"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Idioma por omisión:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Tipografía del texto"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Vista de carpetas"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Mostrar las columnas de número de mensajes en la vista de carpetas"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nombres de grupos con más de"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Vista resumen"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna «Desde» si el remitente es usted mismo"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Elementos visibles en cabecera... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Codificación de caracteres por omisión"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Esto se usa al mostrar mensajes que no indican codificación de caracteres."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Codificación de caracteres para enviar"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4867,11 +4886,11 @@ msgstr ""
 "Si se selecciona «Automática» se utilizará la codificación óptima para la "
 "localización actual."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4879,84 +4898,84 @@ msgstr ""
 "Mostrar alfabéticos y numéricos de múltiples bytes\n"
 "como caracteres ASCII (sólo para Japonés)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Mostrar los mensajes HTML como texto"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Mostrar los mensajes HTML como texto"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Mostrar el cursor en la vista del mensaje"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Media página"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Imágenes"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Mostrar las imágenes en el texto"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Activar el control del correo basura"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Orden para aprender:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Escoger preselección)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "No basura"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Orden de clasificación"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4964,205 +4983,205 @@ msgstr ""
 "Para clasificar los correos basura automáticamente, se debe aprender hasta "
 "cierto punto tanto de los correos basura como de los que no lo son."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Carpeta basura"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Los mensajes que se marquen como basura se moverán a esta carpeta."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensajes clasificados como basura al recibir"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrar el correo basura antes del filtrado normal"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Borrar correos basura del servidor al recibir"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Marcar los correos basura filtrados como leídos"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de firma"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Expirar después de"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Poniendo «0» mantendrá la contraseña durante toda la sesión."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada mientras se introducen contraseñas"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Recordar el último mensaje seleccionado"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Abrir Entrada después de recibir correo nuevo"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Abrir Entrada al inicio"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Los mensajes se marcarán hasta la ejecución si está desactivado."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordena los botones según la Guía de Interfaz de Usuario de GNOME"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Mostrar icono en bandeja"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimizar al icono en bandeja"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Conmutar ventana con el icono en bandeja"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Otras"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Órdenes externas"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Siempre"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay errores de recepción"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción al finalizar"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble clic"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Navegador web por omisión)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Usar programa externo para imprimir"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activar la comprobación estricta de la integridad de la caché resumen"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5172,275 +5191,275 @@ msgstr ""
 "modificados por otras aplicaciones.\n"
 "Esta opción degradará el rendimiento al mostrar el resumen."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Tiempo de espera agotado E/S socket:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Europeo Occidental (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Báltico (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arábigo (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arábigo (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Chino simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "el día de la semana abreviado"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5464,11 +5483,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Si x está, muestra expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5482,7 +5501,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El carácter %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5494,19 +5513,19 @@ msgstr ""
 "Carácter llave abierta\n"
 "Carácter llave cerrada"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Escoger la configuración de atajos de teclado."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Por omisión"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
diff --git a/po/et.po b/po/et.po
index 39e4c78c..3f3a3cc1 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Kaust"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -835,7 +835,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
@@ -857,8 +857,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
@@ -923,7 +923,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -937,12 +937,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -960,7 +960,7 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +990,7 @@ msgstr "/R_edaktor/_Aseta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -1173,7 +1173,7 @@ msgstr "Aadressiraamatu uuendamise viga"
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Kasutajaliides"
 
@@ -1219,7 +1219,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1274,403 +1274,412 @@ msgstr "Pruun"
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Tööriist/Käivita"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Manused"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1678,26 +1687,26 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1707,12 +1716,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1721,15 +1730,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1738,96 +1747,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1837,52 +1846,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2065,7 +2074,7 @@ msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2377,7 +2386,7 @@ msgstr "Uuendan kasuta puu..."
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4160,21 +4169,21 @@ msgstr "Konto omadused"
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Saada"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privaatsus"
 
@@ -4182,7 +4191,7 @@ msgstr "Privaatsus"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
@@ -4310,7 +4319,7 @@ msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automaatne"
 
@@ -4359,8 +4368,8 @@ msgstr "Loo Kirja-ID"
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Redigeeri... "
 
@@ -4386,7 +4395,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autoriseeri POP3 enne saatmist"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Allkiri"
@@ -4697,284 +4706,294 @@ msgstr "Kustuta tegevus"
 msgid "Do you really want to delete this action?"
 msgstr "Kas te tõesti soovite kustutada seda tegevust?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Loon üldiste omaduste akent...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Üldised omadused"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Ekraan"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Võta kirju"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "iga"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuti järel"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Võta uued kirjad töö alguses"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Uuenda kõik lokaalsed kaustad peale kirjade võtmist"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Käsklus"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Võta kirjad lokaalsest kirja jadast"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtreeri kirju nende võtmisel"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Pane saadetud kirjad kausta Saadetud"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Üldine"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Allkirja eraldaja"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Lisa automaatselt"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Vali vastuste jaoks konto automaatselt"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Kirjale vastamisel tsiteeri seda."
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Vasta nupp käivitab vastamise kirjalisti"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Käivita väline redaktor automaatselt"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Meelespeetavaid muudatusi"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Äärista kirjaread"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "sümboli laiuseks"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Äärista tsitaati"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Murra kõik pikad read sisestamisel"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Salvesta mustandite kausta"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normaalne"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Vastuse formaat"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Tsitaadi märk"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Edasta formaat"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Sümbolite seletus "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Vaikimisi kasutatab allkirja võti"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "lühenda uudistegruppe, mis on pikemad kui"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "tähte"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Kirjaloendi vaade"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Kuupäeva formaat"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Määra kirjaloendis näidatavad elemendid... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Kiri"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4983,609 +5002,609 @@ msgstr ""
 "Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
 "lokaali jaoks optimaalset kodeeringut."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Kirja värvimine lubatud"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Näita 2-baidiliste sümbolitega teksti 1-baidiliste sümbolitega"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Näita kirja päist ülalpool kirja vaadet"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Reavahe"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pinkti"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Kerimine"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Pool lehte"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Sujuv kerimine"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Samm"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Päise näitamine"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vali võtmed"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Kustuta kaust"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Kustuta kaust"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automaatselt kontrolli allkirju"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Säilita parooli ajutiselt mälus"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Aegub pärast"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuteid"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Kui seada '0'-ks, siis parool salvesatakse\n"
 "kogu sessiooniks)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Teate faili ei ole valitud."
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Kausta sisenedes ava esimene lugemata kiri"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Võta uued kirjad töö alguses"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Kirjad lihtsalt märgitakse enne täitmit\n"
 " kui see on välja lülitatud)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Ekraani nimi"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Muud asjad"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Alati"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Mitte iial"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Programmist väljumisel"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Kontrolli väljumist"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Tühjenda prügikast"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Küsi enne tühjendamist"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Hoiata mind, kui järjekorras on kirju"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Kasuta välist programmi kirjade võtmiseks"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automaatne (Soovitatav)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitine ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unikood (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Lääne-Euroopa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Kesk Euroopa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türgi (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirillits (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirillits (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirillits (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jaapani (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Jaapani (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Jaapani (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "nädalapäeva esitähed"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "täielik nädalapäeva nimi"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "lühendatud kuu nimetus"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "täispikk kuu nimetus"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "Kuupäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "päev aastas kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "kuu kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minutid kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "kas EL või PL"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekundin kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "nädalapäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuupäev"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "aasta kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon või nimi või lühend"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "*Määraja"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Näide"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Värvid"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Tsitaadi värvid ringelvad"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Vali URI-le värv"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Sümbolite kirjeldus"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5609,11 +5628,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, näitab väljendit"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5627,7 +5646,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5639,20 +5658,20 @@ msgstr ""
 "Täht avanev loogeline sulg\n"
 "Täht sulgev loogeline sulg"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
diff --git a/po/fr.po b/po/fr.po
index 50a11e85..51c85eaa 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Tri (manuel) des indésirables"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -845,7 +845,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
@@ -866,8 +866,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -886,21 +886,21 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
@@ -932,7 +932,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -945,12 +945,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -968,7 +968,7 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +996,7 @@ msgstr "/Co_ller"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1174,7 +1174,7 @@ msgstr "Erreur de conversion du carnet d'adresses"
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interface"
 
@@ -1220,7 +1220,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Information"
 
@@ -1275,362 +1275,371 @@ msgstr "Brun"
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichier/_Ajouter la signature"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/_Affichage/_Faire suivre"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Outils/_Vérifier l'orthographe"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 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:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Pièces jointes"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1638,25 +1647,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 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:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1676,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1693,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1706,93 +1715,93 @@ msgstr ""
 "\n"
 "Envoyer quand même?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1801,50 +1810,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2026,7 +2035,7 @@ msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2328,7 +2337,7 @@ msgstr "La reconstruction de l'arborescence a échoué."
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Indésirable"
 
@@ -4101,21 +4110,21 @@ msgstr "Configuration du compte"
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Composer"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Confidentialité"
 
@@ -4123,7 +4132,7 @@ msgstr "Confidentialité"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avancée"
 
@@ -4249,7 +4258,7 @@ msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -4293,8 +4302,8 @@ msgstr "Génération d'un Message-ID"
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Modifier... "
 
@@ -4319,7 +4328,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Signature"
@@ -4628,85 +4637,85 @@ msgstr "Supprimer l'action"
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer cette action ?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Création de la fenêtre des préférences générales...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Préférences générales"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Affichage"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Courrier indésirable"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Détails"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Relève automatique du courrier"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "chaque"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Relever le courrier au démarrage"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Mettre à jour tous les dossiers locaux après incorporation"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Exécuter la commande lors de l'arrivée de nouveaux messages"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Commande"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "« %d »  sera remplacé par le nombre de nouveaux messages."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Incorporation à partir du spool local"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrage à l'incorporation"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Chemin du spool"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Enregistrer les messages envoyés dans la boîte d'envoi"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Appliquer les règles de filtrage aux messages envoyés"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Algorithme de transmission"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4714,15 +4723,15 @@ msgstr ""
 "Précise le champ « Content-Transfer-Encoding » utilisé quand le corps du "
 "message contient des caractères non ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME de l'en-tête"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4734,177 +4743,187 @@ msgstr ""
 "RFC 2047\n"
 "RFC 2231 : respecte les normes, mais peu utilisée"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Général"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Insérer automatiquement"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Sélection automatique du compte lors d'une réponse"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citer le message en répondant"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton répondre agit pour la liste de diffusion"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 "Envoyer au destinataire original si vous répondez à un message dont vous "
 "êtes l'auteur"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'éditeur externe"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Justifier les messages à"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "caractères"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Justifier la citation"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Justification automatique"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Enregistrer automatiquement dans le dossier des brouillons"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Citation"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Orthographe"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Citation lors d'une réponse"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Caractère de citation"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Citation lors d'un transfert"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Description des symboles "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Activer le vérificateur d'orthographe"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Langue par défaut :"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Police du texte"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Fenêtre des dossiers"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Afficher le nombre de messages non lus près du nom de dossier"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr ""
 "Afficher les statistiques sur les messages dans la fenêtre des dossiers"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "lettres"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Résumé des messages"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afficher le destinataire dans la colonne « Expéditeur » si vous êtes "
 "l'expéditeur du message"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Déployer les fils de conversation"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Éléments affichés dans le résumé... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Message"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Jeu de caractères par défaut"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Ceci est utilisé pour l'affichage de messages sans jeu de caractères associé."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Jeu de caractères pour l'envoi"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4912,11 +4931,11 @@ msgstr ""
 "Si « Automatique » est sélectionné, le jeu de caractères optimal pour la "
 "langue utilisée sera choisi automatiquement."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Coloration des messages"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4924,84 +4943,84 @@ msgstr ""
 "Afficher l'alphabet et les nombres multi-octets\n"
 "comme des caractères ASCII (Japonais seulement)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-têtes au dessus du message"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Afficher les messages HTML comme du texte"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Afficher les messages HTML comme du texte"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Afficher le curseur dans la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Défilement"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Défilement continu"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Images"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Adapter les images aux dimensions de la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Afficher les images directement dans le message"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Activer la gestion des messages indésirables"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Commande d'apprentissage :"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Sélectionnez le pré-réglage)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Acceptable"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Commande de détection"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5009,210 +5028,210 @@ msgstr ""
 "Une certaine période de temps d'apprentissage est nécessaire pour pouvoir "
 "faire automatiquement le tri entre courriers acceptables et indésirables."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Dossier des indésirables"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Les messages marqués comme indésirables seront déplacés dans ce dossier."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Tri des messages détectés comme indésirables à la réception"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Tri des messages indésirables avant application des filtres"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Effacer les courriers indésirables du serveur lors de la réception"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Marquer les courriers indésirables comme lus"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Afficher le résultat de la vérification dans une fenêtre"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Mémoriser temporairement la phrase secrète"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Expiration après"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minute(s) "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Mettre 0 pour mémoriser la phrase secrète pendant toute la durée de la "
 "session."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Se souvenir du dernier message sélectionné"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marquer un message comme lu uniquement si ouvert dans une nouvelle fenêtre"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Aller dans la boîte de réception lors de l'arrivée de nouveau courrier"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Aller dans la boîte de réception au démarrage"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Si désactivé, les messages resteront marqués jusqu'à exécution."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Mettre les boutons en conformité avec les « HIG » GNOME"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Afficher une icône dans la zone de notification"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimiser dans la zone de notification"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 "Afficher ou minimiser en cliquant sur l'icône dans la zone de notification"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Autres"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Commande externes"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Message de réception"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception :"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Toujours"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Seulement lors d'une relève manuelle du courrier"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Jamais"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre d'erreur lors d'une erreur de réception"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception à la fin"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Confirmer en quittant"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Demander avant de vider"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Commandes externes (%s sera remplacé par le nom du fichier ou l'URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Navigateur Web par défaut)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Utiliser un programme externe pour l'impression"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Utiliser un programme externe pour l'incorporation"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Utiliser un programme externe pour l'envoi"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activer la vérification stricte de l'intégrité des caches d'index"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5222,275 +5241,275 @@ msgstr ""
 "programmes.\n"
 "Cette option réduira les performances d'affichage du résumé des messages."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatique (recommandé)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII 7 bits (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Europe occidentale (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Europe occidentale (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe centrale (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balte (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balte (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Balte (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabe (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabe (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hébreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinois simplifié (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thaï (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abrégé)"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "nom du mois (abrégé)"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Paramétrer les couleurs de message"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Texte cité - 1er niveau"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Texte cité - 2e niveau"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Texte cité - 3e niveau"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Réutiliser les couleurs"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5514,11 +5533,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Si x est défini, afficher expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5532,7 +5551,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caractère pourcent « % »"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5544,19 +5563,19 @@ msgstr ""
 "Caractère « { »\n"
 "Caractère « } »"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Choisissez les raccourcis clavier."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
diff --git a/po/gl.po b/po/gl.po
index 2e6056eb..833260a6 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Carpeta"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -833,7 +833,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -855,8 +855,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -921,7 +921,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -935,12 +935,12 @@ msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -958,7 +958,7 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +988,7 @@ msgstr "/_Editar/_Pegar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -1172,7 +1172,7 @@ msgstr "Erro na conversión da axenda"
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -1218,7 +1218,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1273,403 +1273,412 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Adxuntos"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1677,25 +1686,25 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1706,12 +1715,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1720,15 +1729,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1737,95 +1746,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1835,52 +1844,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2063,7 +2072,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2373,7 +2382,7 @@ msgstr "Reconstruindo a arbre de carpetas..."
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4161,21 +4170,21 @@ msgstr "Preferencias da conta"
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -4183,7 +4192,7 @@ msgstr "Privacidad"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -4311,7 +4320,7 @@ msgid "Authentication method"
 msgstr "Método de autenticación"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automática"
 
@@ -4360,8 +4369,8 @@ msgstr "Xenerar ID-Mensaxe"
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4387,7 +4396,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Sinatura"
@@ -4695,88 +4704,88 @@ msgstr "Borrar acción"
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quere borrar esta acción?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Creando fiestra de preferencias comuns...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Preferencias comuns"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Ver"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Comprobar correo novo"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "cada"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Comproba correo novo ó inicio"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todas as carpetas locales despois de incorporar"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Obtendo o número de novas mensaxes (asT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Incorporar do almacén"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrar ó incorporar"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Gardar mensaxes enviados en Saida"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4785,196 +4794,206 @@ msgstr ""
 "Especificar a codificación de transferencia (Content-Transfer-Encoding)\n"
 "cando o corpo do mensaxe conten caracteres non-ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Codificación para enviar"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Codificación para enviar"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Xerais"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Separador de sinatura"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Inserir automáticamente"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente a conta para respostar"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citar a mensaxe ó respostar"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "o botón Respostar invoca respostar á lista de correo"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Lanzar o editor externo automáticamente"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Niveles de desfacer"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Recortar mensaxes ós"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Recortar mentras se escribe"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Gardar como borrador"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Texto"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nomes de grupos con mais de"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Vista resumo"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Expandir fíos"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Elementos visibles no resumo... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Mensaxe"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4983,11 +5002,11 @@ msgstr ""
 "Si se selecciona `Automático' utilizarase a\n"
 "codificación óptima para a localización actual."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensaxe"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4995,597 +5014,597 @@ msgstr ""
 "Mostrar alfabéticos e numéricos multi-byte como\n"
 "caracteres ASCII (só para Xaponés)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Desplazamento"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Media páxina"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar as imáxes adxuntas"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceiras"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Seleccione teclas"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Borrar carpeta"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Borrar carpeta"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Comprobar as sinaturas automáticamente"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de sinatura"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Manter contrasinal en memoria temporalmente"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Expirar despois de"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Poniendo '0' mantendrá a contraseña\n"
 " durante toda a sesión)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada mentras se introducen contrasinais"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso no inicio si non funciona GnuPG"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaxe como leída só ó abrila nunha fiestra nova"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Abrir entrada despois de recibir correo novo"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Comproba correo novo ó inicio"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Os mensaxes marcaránse hasta a execución\n"
 " si está desactivado)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Nome mostrado"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Outras"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrar diálogo de erro si hai erros de recepción"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción ó finalizar"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Engadir dirección ó destino con doble click"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Ó sair"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Confirmar ó sair"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Baleirar papeleira ó sair"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Preguntar antes de baleirar"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensaxes na cola"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Xaponés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Xaponés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Xaponés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "o número de século (año/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como número decimal"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como número usando o reloxo de 24 horas"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como número usando o reloxo de 12 horas"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como número decimal"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "o mes como número decimal"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "o minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "o segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como número decimal"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "os dous últimos díxitos do ano"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "o ano como número decimal"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citación"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5609,11 +5628,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Si x está, mostra expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5627,7 +5646,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o carácter %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5639,20 +5658,20 @@ msgstr ""
 "Carácter chave aberta\n"
 "Carácter chave pechada"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
diff --git a/po/hr.po b/po/hr.po
index 282db0fa..0bf228b2 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Spis"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -837,7 +837,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -860,8 +860,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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/_Spremi"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
@@ -926,7 +926,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: 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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -963,7 +963,7 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +993,7 @@ msgstr "/_Uredi/U_baci"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1169,7 +1169,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Sučelje"
 
@@ -1216,7 +1216,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1271,307 +1271,307 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u spis _nedovršeno"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Priloži datoteku"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:574
+#: src/compose.c:575
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Sažmi _poglavlje"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:584
+#: src/compose.c:585
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:585
+#: src/compose.c:586
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/_Pregled"
 
-#: src/compose.c:586
+#: src/compose.c:587
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Poruka/P_roslijedi"
 
-#: src/compose.c:591
+#: src/compose.c:592
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:593
+#: src/compose.c:594
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:685
+#: src/compose.c:686
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
@@ -1579,105 +1579,114 @@ msgstr "/_Izvrši"
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Izvrši"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Prilog"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1685,25 +1694,25 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1711,12 +1720,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1725,15 +1734,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1742,97 +1751,97 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1842,53 +1851,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2071,7 +2080,7 @@ msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2387,7 +2396,7 @@ msgstr "Osvježavam stablo spisa..."
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4257,21 +4266,21 @@ msgstr "Postavke računa"
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake računa...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -4279,7 +4288,7 @@ msgstr "Privatnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4410,7 +4419,7 @@ msgid "Authentication method"
 msgstr "Autorizacija"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr ""
 
@@ -4460,8 +4469,8 @@ msgstr "Generiraj ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4484,7 +4493,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autoriziraj s POP3 prije slanja"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Potpis"
@@ -4788,287 +4797,297 @@ msgstr "Obriši račun"
 msgid "Do you really want to delete this action?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Stvaram prozor za uobičajene postavke...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Uobičajene postavke"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Auto-provjera nove pošte"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "svakih"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Provjeri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Osvježi sve spise poslije prihvaćanja"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Naredba"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Prihvati sa spoola"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtriraj pri prihvaćanju"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Izlazni charset"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Izlazni charset"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Razdjelnik potpisa"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi račun pri odgovaranju"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Odgovori svi_ma"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni vanjski uređivač"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 #, fuzzy
 msgid "Wrap on input"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Proslijedi"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Format prosljeđivanja"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Stalni ključ potpisa"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 #, fuzzy
 msgid "letters"
 msgstr "Obriši"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Postavi pojedinosti prikaza... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Pošta"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5077,612 +5096,612 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišten."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve s 1-byte znakovima"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz postavki zaglavlja"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Odaberite ključeve"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Obriši spis"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Obriši spis"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automatski provjeri potpis"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 #, fuzzy
 msgid "Expired after"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 #, fuzzy
 msgid "minute(s) "
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "poruka neće biti primljena\n"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Nema više label poruka"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Pošta/O_tvori u novom prozoru"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Idi u sandučić nakon primanja pošte"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Provjeri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Prikaz imena"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 #, fuzzy
 msgid " Set key bindings... "
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Uvijek"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Pitaj prije pražnjenja"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Koristi vanjski program za slanje"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Koristi vanjski program za prihvat"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Koristi vanjski program za slanje"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Europski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Čirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Čirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Čirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "skraćeno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "broj stoljeća (godina/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Označitelj"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći stupanj"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Ciklički mijenjaj boje citata"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5706,11 +5725,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5719,7 +5738,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5727,22 +5746,22 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 #, fuzzy
 msgid "Key bindings"
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 #, fuzzy
 msgid "Default"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 09de7620..4cb58db1 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Levélszemét szűrés (kézi)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -834,7 +834,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
@@ -855,8 +855,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
@@ -921,7 +921,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -934,12 +934,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -985,7 +985,7 @@ msgstr "/_Beillesztés"
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -1157,7 +1157,7 @@ msgstr "Címjegyzék konvertálási hiba"
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Illesztő"
 
@@ -1203,7 +1203,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1258,360 +1258,369 @@ msgstr "Barna"
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Küldés"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Fájl/Kü_ldés később"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fájl/Mentés a Vázlatok mappába"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fájl/Mentés és _szerkesztésben marad"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Fájl/Aláírás _csatolása"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Szerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/_Nézet/_Válaszcím"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/_Nézet/Vá_laszcikk-cím"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Nézet/Eszközs_áv testreszabása..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 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:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 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:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 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:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Műveletek"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Szerkesztés/Szerkesztés _külső programmal"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/PGP _Aláírás"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Eszközök/_Helyesírásellenőrzés"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Csatolások"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,26 +1628,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1649,11 +1658,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1666,15 +1675,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1689,93 +1698,93 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1784,48 +1793,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2005,7 +2014,7 @@ msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2306,7 +2315,7 @@ msgstr "Mappafa újraépítése sikertelen."
 msgid "Checking for new messages in all folders..."
 msgstr "Új levelek keresése minden mappában..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Levélszemét"
 
@@ -4060,21 +4069,21 @@ msgstr "Hozzáférés beállítások"
 msgid "Creating account preferences window...\n"
 msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Küldés"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Új levél"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Magánszféra"
 
@@ -4082,7 +4091,7 @@ msgstr "Magánszféra"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Haladó"
 
@@ -4206,7 +4215,7 @@ msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -4250,8 +4259,8 @@ msgstr "Message-ID generálása"
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
@@ -4276,7 +4285,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Azonosítás küldés előtt POP3-mal"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Aláírás"
@@ -4585,85 +4594,85 @@ msgstr "Művelet törlése"
 msgid "Do you really want to delete this action?"
 msgstr "Tényleg töröljem ezt a műveletet?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Általános beállítások ablak létrehozása...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Általános beállítások"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Levélszemét"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Részletek"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automatikus levélfigyelés"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "minden"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "perc után"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Új levelek ellenőrzése induláskor"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Fogadás után minden helyi mappa frissítése"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Parancs végrehajtása, ha új levél érkezett"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Parancs"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "A `%d' helyére az új levelek száma kerül."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Fogadás helyi tárolóból"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Szűrés fogadás közben"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Tároló elérési útja"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Elküldött levelek mentése a Kimenő mappába"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Szűrőszabályok alkalmazása az elküldött levelekre"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Átvitel kódolása"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4671,15 +4680,15 @@ msgstr ""
 "Adja meg a Content-Transfer-Encoding értékét, ha a levél tartalmaz nem-ASCII "
 "karaktereket is."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "MIME fájlnév kódolás"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME fejléc"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4690,173 +4699,183 @@ msgstr ""
 "MIME fejléc: nagyon népszerű, de sérti az RFC 2047 szabványait\n"
 "RFC 2231: alkalmazkodik a szabványhoz, de nem túl népszerű"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Általános"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Automatikus beillesztés"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Automatikus hozzáférés választás válaszkor"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Levél idézése a válaszban"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "A `Válasz' gomb a `Válasz levelező listára' funkciót hozza fel"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "A saját levélre válaszkor öröklött címzettek"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Külső szerkesztő automatikus indítása"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Visszavonás mélysége"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Sortörés helye"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Idézet törése"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Bevitel tördelése"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Automatikus mentés a vázlat mappába"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Formátum"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Helyesírásellenőrzés"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Válasz formátuma"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Idézet jele"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Továbbítás formátuma"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Szimbólumok leírása "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Helyesírásellenőrzés bekapcsolása"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Alapértelmezett nyelv:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Szöveg betűkészlete"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Mappanézet"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Mappanézetben jelenítse meg a levelek számának oszlopát"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "levél"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Összefoglaló nézet"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Címzett mutatása a `Feladó' oszlopban, ha önmagának küldte"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Folyam kifejtése"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Dátum formátuma"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Összefoglalás kijelzésének beállítása... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Levél"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Alapértelmezett karakterkódolás"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Ezt használja a program olyan levelek megjelenítéséhez, amiben nincs megadva "
 "'character encoding' sor."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Kimenő levelek karakterkódolása"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4864,11 +4883,11 @@ msgstr ""
 "Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást használja "
 "a helyi nyelvi beállításoknak megfelelően."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Színek használata a levelekhez"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4876,84 +4895,84 @@ msgstr ""
 "Több byte-os karakterek és számok megjelenítése\n"
 "ASCII karakterekkel (csak japán esetén)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Fejlécmező megjelenítése a levél fölött"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Rövid fejlécek a levélnézetben"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "HTML levél értelmezése szövegként"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "HTML levél értelmezése szövegként"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Kurzor megjelenítése levélnézetben"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Sortávolság"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "Képpont"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Fél oldal"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Finom görgetés"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Lépés"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Képek"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "A nagy méretű csatolt képek ablakméretre igazítása"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Képek megjelenítése egyvonalban"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Levélszemét szabályozás engedélyezése"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Tanítás parancs:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Beállítás választás)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Nem levélszemét"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Osztályozó parancs"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4961,208 +4980,208 @@ msgstr ""
 "A levélszemét automatikus osztályozásánál, egy bizonyos mértékig kézzel kell "
 "tanítani a levélszemét és a levél válogatását."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Levélszemét mappa"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Azon levelek, melyek levélszemétként lettek beállítva törlődni fognak ebből "
 "a mappából."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "A fogadáskor megszűrt levelek levélszemétként osztályozva"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Levélszemét szűrése a normális szűrés előtt"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Levélszemét törlése a szerverről fogadáskor"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Szűrt jelölés a levélszemétre olvasáskor"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Digitális aláírás automatikus ellenőrzése"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Jelmondat ideiglenes tárolása a memóriában"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Lejár ennyi után"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "perc"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0'-ra állítva tárolja a jelmondatot a teljes menet alatt."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel elkapása egy jelmondat beadásakor"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "A levelek mindig összefoglalva jelennek meg, ha ez kiválasztott"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Az első olvasatlan levél megnyitása, ha egy mappa nyitott"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Emlékezzen a legutóbb kiválasztott levélre"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Csak az új ablakban megnyitott leveleket jelölje olvasottként"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Fogadás után a bejövő mappa megnyitása"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Bejövő mappa megnyitás induláskor"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Azonnali végrehajtás a levél mozgatásakor vagy törlésekor"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "A levelek kijelölten láthatók a feldolgozás alatt, ha ez ki van kapcsolva."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "A gombrendszer elkészítése a GNOME HIG szerint"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Tálcaikon megjelenítése"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimalizálás tálcaikonként"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Az ablak elrejtése/megjelenítése a tálcaikonra kattintáskor"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Billentyű hozzárendelések... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Egyéb"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Külső parancsok"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Fogadó ablak"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Fogadó ablak mutatása"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Mindig"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Csak kézi fogadáskor"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Soha"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Fogadó ablak bezárása ha végzett"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk esetén cím a célmezőbe"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Kilépéskor"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Kilépéskor rákérdez"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Kuka ürítése kilépéskor"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Ürítés előtt rákérdez"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Elküldetlen levelek esetén figyelmeztet"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Web böngésző"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Alapértelmezett böngésző)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Külső program használata nyomtatáshoz"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Külső program használata email fogadáshoz"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Külső program használata küldéshez"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Összefoglaló gyorstár sértetlenségének pontos ellenőrzése"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5172,275 +5191,275 @@ msgstr ""
 "alkalmazás módosíthatja.\n"
 "Ez az opció lassítja az összefoglalás megjelenésének idejét."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Hálózati adatátvitel időtúllépés:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "másodperc"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatikus (Ajánlott)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bites ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Nyugat Európai (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Nyugat Európai (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Nyugat Európai (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Közép Európai (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikumi (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikumi (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Baltikumi (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Görög (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arab (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arab (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Héber (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Héber (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Török (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirill (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirill (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirill (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japán (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japán (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japán (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszerűsített Kínai (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Egyszerűsített Kínai (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionális Kínai (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionális Kínai (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kínai (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "a teljes hónapnév"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "évszázad (év/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "hónap napja számként"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "óra számként (24 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "óra számként (12 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "Az év napja számként"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "hónap számként"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "perc számként"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "másodperc számként"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "hét napja számként"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két számjegye"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "év számként"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "időzóna vagy név vagy rövidítés"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Leírás"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Példa"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Levélszínek beállítása"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Idézett szöveg - első szint"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Idézett szöveg - második szint"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Idézett szöveg - harmadik szint"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI-kapocs"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Idézet színeinek újrahasznosítása"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "1. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "2. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "3. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "URI színe"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5464,11 +5483,11 @@ msgstr ""
 "Hírcsoportok\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5482,7 +5501,7 @@ msgstr ""
 "Idézett levéltörzs aláírás nélkül\n"
 "Szó szerint %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5494,19 +5513,19 @@ msgstr ""
 "Nyitó kapcsos zárójel\n"
 "Záró kapcsos zárójel"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Válasszon a beállított billentyű hozzárendelésekből."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Régi Sylpheed"
 
diff --git a/po/it.po b/po/it.po
index 4a4d16bd..aedd863c 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Filtro mail spazzatura (manuale)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -833,7 +833,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
@@ -854,8 +854,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
@@ -920,7 +920,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -933,12 +933,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -956,7 +956,7 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -984,7 +984,7 @@ msgstr "/_Incolla"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -1161,7 +1161,7 @@ msgstr "Errore di conversione della rubrica"
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interfaccia"
 
@@ -1207,7 +1207,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1262,360 +1262,369 @@ msgstr "Marrone"
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_File/A_ggiungi firma"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visualizza/Per_sonalizza barra degli strumenti"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (_Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/C_ifratura PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/S_trumenti/_Controllo ortografico"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Allegati"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1623,27 +1632,27 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,11 +1664,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1673,15 +1682,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1695,93 +1704,93 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1790,48 +1799,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2012,7 +2021,7 @@ msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2314,7 +2323,7 @@ msgstr "La ricostruzione delll'albero della cartella è fallita."
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Spazzatura"
 
@@ -4071,21 +4080,21 @@ msgstr "Preferenze dell'account"
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Invia"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Componi"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4093,7 +4102,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avanzato"
 
@@ -4218,7 +4227,7 @@ msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -4262,8 +4271,8 @@ msgstr "Genera ID messaggio"
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Modifica... "
 
@@ -4288,7 +4297,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Firma"
@@ -4597,85 +4606,85 @@ msgstr "Elimina l'azione"
 msgid "Do you really want to delete this action?"
 msgstr "Eliminare questa azione?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Creazione della finestra delle preferenze comuni...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Preferenze comuni"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Mail spazzatura"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Dettagli"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Controllo automatico nuova posta"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "ogni"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuto(i)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Controlla se c'è nuova posta all'avvio"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Aggiorna tutte le cartelle locali dopo l'incorporazione"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Esegui il comando quando arrivano nuovi messaggi"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "«%d» sarà sostituito con il numero dei nuovi messaggi."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Incorpora dallo spool locale"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtra quando incorpori"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Percorso dello spool"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Salva i messaggi inviati nella cartella «Inviata»"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Applica le regole del filtro nell'inviare i messaggi"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Codifica di trasferimento"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4683,15 +4692,15 @@ msgstr ""
 "Specificare il contenuto della codifica di trasferimento usata quando il "
 "corpo del messaggio contiene dei caratteri non-ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Codifica nome file MIME"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Intestazione MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4702,173 +4711,183 @@ msgstr ""
 "Intestazione MIME : popolare, ma viola RFC 2047\n"
 "RFC 2231: conforme allo standard, ma non popolare"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Generale"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Separatore della firma"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Inserisci automaticamente"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Seleziona automaticamente l'account per le risposte"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Cita il messaggio quando rispondi"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Eredita i destinatari in risposta agli auto messaggi"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Lancia automaticamente l'editor esterno"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Livello di annulla"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Vai a capo nei messaggi dopo"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "caratteri"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "A capo nella citazione"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "A capo durante l'input"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Salvataggio automatico nelle bozze"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Formato"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Controllo ortografico"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Formato della risposta"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Formato di inoltro"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Descrizione dei simboli "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Abilita controllo ortografico"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Lingua predefinita:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Carattere del testo"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Vista cartella"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Mostra le colonne del numero dei messaggi nella vista cartella"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Accorcia i newsgroup più lunghi di"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "lettere"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Vista sommario"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Formato della data"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Imposta le voci visibili nel sommario... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Codifica caratteri predefinita"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Viene usato quando si visualizzano messaggi con la codifica caratteri "
 "mancante."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Codifica caratteri in uscita"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4876,11 +4895,11 @@ msgstr ""
 "Selezionando «Automatico» verrà usata la codifica ottimale per la località "
 "attuale."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Abilita la colorazione del messaggio"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4888,84 +4907,84 @@ msgstr ""
 "Mostra l'alfabeto e il numero multy-byte come\n"
 "carattere ASCII (solo Giapponese)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Trasforma i messaggi HTML come testo."
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Trasforma i messaggi HTML come testo."
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Mostra il cursore nella vista messaggio"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Spazio tra le righe"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Scorrimento"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Mezza pagina"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Scorrimento uniforme"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Immagini"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Mostra immagini in linea"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Abilita il controllo della mail spazzatura"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Comando di apprendimento:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(seleziona predefinito)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Normale"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Comando di classificazione"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4974,210 +4993,210 @@ msgstr ""
 "spazzatura e non spazzatura devono essere apprese manualmente per un certo "
 "periodo."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Cartella spazzatura"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "I messaggi impostati come mail spazzatura saranno spostati in questa "
 "cartella."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtra in ricezione i messaggi classificati come spazzatura"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtra le mail spazzatura prima del filtraggio normale"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Elimina le mail spazzatura dal server in ricezione"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Segna le mail spazzatura filtrate come lette"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Controlla automaticamente le firme"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Mostra il risultato del controllo della firma in una finestra di popup"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Conserva temporaneamente in memoria la phassphrase"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Scade dopo"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuto(i)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Impostando a «0» si conserverà la passphrase per l'intera sessione"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Nascondi l'input durante l'inserimento della passphrase"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Apri sempre i messaggi nel sommario quando selezionati"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Apri il primo messaggio non letto quando viene aperta una cartella"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Ricorda l'ultimo messaggio selezionato"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Segna il messaggio come letto solo quando è aperto in una nuova finestra"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Vai a «In entrata» all'avvio"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "I messaggi verranno solo segnati fino all'esecuzione se questa è inattiva."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Disposizione dei pulsanti conforme con lo GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Mostra l'icona nella tray"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimizza nell'icona della tray"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Mostra/nascondi la finestra con un click sull'icona nella tray"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Impostazione delle associazioni dei tasti... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Altro"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Comandi esterni"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Finestra di ricezione"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Solo in ricezione manuale"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Mai"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di ricezione quando finito"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Chiedi la conferma all'uscita"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Svuota il cestino all'uscita"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Chiedi prima di svuotare"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Avverti se ci sono messaggi accodati"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Browser predefinito)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Usa un programma esterno per la stampa"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Usa un programma esterno per incorporare la posta"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Usa un programma esterno per l'invio"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Abilita il controllo stretto dell'integrità delle cache del sommario"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5187,275 +5206,275 @@ msgstr ""
 "modificati da altre applicazioni.\n"
 "Questa opzione degraderà le prestazioni della visualizzazione del sommario."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Timeout del socket I/O:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "secondo(i)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatica (Raccomandata)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII a 7 bit (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Occidentale (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Europa Occidentale (Windows 1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Centrale (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Baltico (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabo (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabo (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Ebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirillico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirillico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Giapponese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Cinese semplificato (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la località attuale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 24 ore"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 12 ore"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località attuale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5479,11 +5498,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Se è impostato x, mostra expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5497,7 +5516,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5509,19 +5528,19 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Impostazione delle associazioni dei tasti."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
diff --git a/po/ja.po b/po/ja.po
index 409469ac..cfa82f02 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "迷惑メールフィルタ (手動)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -830,7 +830,7 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -851,8 +851,8 @@ msgstr "/ファイル(_F)/新規_JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 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:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -930,12 +930,12 @@ msgstr "/ツール(_T)/_LDIFファイルをインポート"
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -953,7 +953,7 @@ msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -981,7 +981,7 @@ msgstr "/ペースト(_P)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -1155,7 +1155,7 @@ msgstr "アドレス帳変換エラー"
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "インタフェース"
 
@@ -1201,7 +1201,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1256,360 +1256,368 @@ msgstr "茶"
 msgid "None"
 msgstr "なし"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/追加(_A)..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/ファイル(_F)/送信(_S)"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/ファイル(_F)/後で送信(_L)"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/ファイル(_F)/ファイルを添付(_A)"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/ファイル(_F)/ファイルを挿入(_I)"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/ファイル(_F)/署名を挿入(_G)"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/ファイル(_F)/署名を追加(_P)"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/編集(_E)/元に戻す(_U)"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編集(_E)/現在の段落を整形する(_W)"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/表示(_V)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/表示(_V)/宛先(_T)"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/表示(_V)/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/表示(_V)/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/表示(_V)/返信先を指定(_Reply-To)"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/表示(_V)/フォロー先を指定(_Followup-To)"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/表示(_V)/ルーラ(_U)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/表示(_V)/ツールバーをカスタマイズ(_S)..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/ツール(_T)/スペルチェック(_C)"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+msgid "Attachment is missing"
+msgstr "添付ファイルがありません"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1617,25 +1625,25 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1646,11 +1654,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1663,15 +1671,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1685,93 +1693,93 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1780,48 +1788,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2001,7 +2009,7 @@ msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2302,7 +2310,7 @@ msgstr "フォルダツリーの再構築に失敗しました。"
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "迷惑メール"
 
@@ -4051,21 +4059,21 @@ msgstr "アカウントの設定"
 msgid "Creating account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "受信"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "送信"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "作成"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "個人情報"
 
@@ -4073,7 +4081,7 @@ msgstr "個人情報"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "高度な設定"
 
@@ -4197,7 +4205,7 @@ msgid "Authentication method"
 msgstr "認証方式"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "自動"
 
@@ -4241,8 +4249,8 @@ msgstr "メッセージIDを生成する"
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " 編集... "
 
@@ -4266,7 +4274,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "送信前にPOP3認証を行う"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "署名"
@@ -4574,85 +4582,85 @@ msgstr "アクションの削除"
 msgid "Do you really want to delete this action?"
 msgstr "本当にこのアクションを削除してもいいですか?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "全般プリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "全般の設定"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "表示"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "迷惑メール"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "詳細"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "新着メールを自動チェックする"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr " "
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "分ごと"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "起動時に新着メールをチェックする"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "受信後にすべてのローカルフォルダを更新する"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "新着メッセージが到着したらコマンドを実行する"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "コマンド"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' は新着メッセージ数で置き換えられます。"
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "ローカルスプールから取り込む"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "取込時に振り分ける"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "スプールのパス"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "送信したメッセージを送信控に保存する"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "送信したメッセージにフィルタルールを適用する"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "転送符号化方式"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4660,15 +4668,15 @@ msgstr ""
 "メッセージ本文がASCII文字以外を含む場合に使用する Content-Transfer-Encoding "
 "を指定してください。"
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "MIMEファイル名エンコーディング"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIMEヘッダ"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4678,172 +4686,182 @@ msgstr ""
 "MIMEヘッダ: 最も普及しているが、RFC 2047に違反\n"
 "RFC 2231: 標準に準拠しているが、普及していない"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr "次の文字列(カンマ区切り)がメッセージ本文に含まれる場合は添付を確認する"
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr "(例: 添付)"
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "署名の区切り"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "自動的に挿入する"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "返信"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "返信時に自動的にアカウントを選択する"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "返信時にメッセージを引用する"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "返信ボタンでメーリングリストに返信する"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "自分が出したメッセージに返信した場合は宛先を引き継ぐ"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "外部エディタを自動的に起動する"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "アンドゥの回数"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "メッセージを半角"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "文字で改行"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "引用部を自動整形する"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "入力時に自動整形する"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "草稿に自動保存する"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "書式"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "スペルチェック"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "返信の書式"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "引用符"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "転送の書式"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " 記号の説明 "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "スペルチェックを有効にする"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "既定の言語:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "テキストフォント"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "フォルダビュー"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "フォルダ名の横に未読数を表示する"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "フォルダビューにメッセージ数のカラムを表示する"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "文字数が"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "字より長いニュースグループ名を簡略表示"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "サマリビュー"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "スレッドを展開する"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "日付の書式"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " サマリの表示項目を設定... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "既定の文字エンコーディング"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "これはエンコーディングが未指定のメッセージを表示するときに使用されます。"
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "送信文字エンコーディング"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4851,93 +4869,93 @@ msgstr ""
 "「自動設定」を選択した場合は、現在の言語設定に最適なエンコーディングが使用さ"
 "れます。"
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "メッセージの色を有効にする"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "メッセージビューの上部にヘッダペインを表示する"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "メッセージビューに簡略ヘッダを表示する"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "HTML メッセージを解釈してテキスト表示する"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 msgid "Treat HTML only messages as attachment"
 msgstr "HTML のみのメッセージを添付として扱う"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "メッセージビューにカーソルを表示する"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "行間を空ける"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "ピクセル"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "半ページ単位"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "スムーズスクロール"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "間隔"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "画像"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "画像をインラインで表示する"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "迷惑メール対策を有効にする"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "学習コマンド:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(プリセットを選択)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "非迷惑メール"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "判定コマンド"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4945,206 +4963,206 @@ msgstr ""
 "迷惑メールを自動的に判定するには、迷惑メールと非迷惑メールの両方をある程度ま"
 "で手動で学習させる必要があります。"
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "迷惑メールフォルダ"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "迷惑メールに指定したメッセージをこのフォルダに移動します。"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "受信時に迷惑メールと判定されたメッセージを振り分ける"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "通常の振り分けの前に迷惑メールを振り分ける"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "受信時に迷惑メールをサーバから削除する"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "振り分けた迷惑メールを既読にする"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "署名を自動的に検証する"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "署名の検証結果をポップアップウィンドウで表示する"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "パスフレーズをメモリ上に一時的に記憶する"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "有効期間"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "分"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0' に設定するとセッションの間中パスフレーズを記憶します。"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "パスフレーズの入力時に入力を捕捉する"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG が動作しない場合起動時に警告を表示する"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "サマリでメッセージを選択したとき常に開く"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "フォルダを開いたときに最初の未読メッセージを開く"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "最後に選択したメッセージを記憶する"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "新着メールを受信した後受信箱を開く"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "起動時に受信箱を開く"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "メッセージを移動または削除したら即座に実行する"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "これを無効にすると、メッセージは実行されるまでマークされた状態になります。"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "ボタンの配置をGNOME HIGに準拠"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "トレイアイコンを表示する"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "最小化したときにトレイアイコンに格納する"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "トレイアイコンのクリックでウィンドウの表示を交互に切り替える"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " キーバインドを設定... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "その他"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "外部コマンド"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "受信ダイアログ"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "受信ダイアログを"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "常に表示"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "手動で受信した場合のみ表示"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "表示しない"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "受信エラー時にエラーダイアログをポップアップしない"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "完了時に受信ダイアログを閉じる"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "終了時"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "終了時に確認する"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "終了時にごみ箱を空にする"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "空にする前に尋ねる"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "送信待機中のメッセージがあれば警告する"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Webブラウザ"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(既定のブラウザ)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "印刷に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "メールの受信に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "メールの送信に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "サマリキャッシュの整合性を厳密にチェックする"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5154,275 +5172,275 @@ msgstr ""
 "にしてください。\n"
 "このオプションはサマリ表示の性能を低下させます。"
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "ソケット I/O のタイムアウト:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "自動設定 (推奨)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "欧米 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "欧米 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "欧米 (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルト諸国 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルト諸国 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "バルト諸国 (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "ギリシャ語 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "アラビア語 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "アラビア語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "ヘブライ語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "ヘブライ語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "トルコ語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "キリル文字 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "キリル文字 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "キリル文字 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "キリル文字 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日本語 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "日本語 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "日本語 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡体字中国語 (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "簡体字中国語 (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体字中国語 (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体字中国語 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中国語 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "タイ語 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "タイ語 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "曜日の省略名"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "曜日の完全な名前"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "月の省略名"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "月の完全な名前"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "現在の地域における一般的な日付と時刻の表記"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "世紀(西暦年の上2桁)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "日(10進数表記)"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24時間時計での時"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12時間時計での時"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "年の初めから通算の日数(10進数表記)"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "月(10進数表記)"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "分(10進数表記)"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "午前または午後"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "秒(10進数表記)"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "週の何番目の日か(10進数表記)"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "現在の地域における一般的な日付表記"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "西暦の下2桁(世紀部分を含まない年)"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "(4桁の)西暦年"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "タイムゾーンまたはゾーン名または省略名"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "指定子"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "説明"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "例"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "メッセージの色を指定"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "色"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "引用文 - 1段階"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "引用文 - 2段階"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "引用文 - 3段階"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI リンク"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "引用色を循環"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "引用レベル1の色を選択"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "引用レベル2の色を選択"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "引用レベル3の色を選択"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "URI の色を選択"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "記号の説明"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5446,11 +5464,11 @@ msgstr ""
 "ニュースグループ\n"
 "メッセージID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "xが指定されていればexprを表示"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5464,7 +5482,7 @@ msgstr ""
 "引用符付きメッセージ本文(署名なし)\n"
 "文字 %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5476,19 +5494,19 @@ msgstr ""
 "文字 開き中括弧\n"
 "文字 閉じ中括弧"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "キーバインド"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr " キーバインドのプリセットを選択してください。"
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "標準"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "旧Sylpheed"
 
diff --git a/po/ko.po b/po/ko.po
index 0a5e2d04..ceeec1ee 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "폴더"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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 "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -846,8 +846,8 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -866,21 +866,21 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
@@ -912,7 +912,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -926,12 +926,12 @@ msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -949,7 +949,7 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -979,7 +979,7 @@ msgstr "/편집(_E)/붙여넣기(_P)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "주소록"
 
@@ -1156,7 +1156,7 @@ msgstr "주소록 변환 에러"
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "인터페이스"
 
@@ -1202,7 +1202,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "알림"
 
@@ -1257,403 +1257,412 @@ msgstr "갈색"
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "첨부"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1661,25 +1670,25 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1689,12 +1698,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1703,15 +1712,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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,96 +1729,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,52 +1828,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2047,7 +2056,7 @@ msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2356,7 +2365,7 @@ msgstr "폴더 트리를 갱신합니다..."
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4133,21 +4142,21 @@ msgstr "계정 기본 설정"
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "작성"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "프라이버시"
 
@@ -4155,7 +4164,7 @@ msgstr "프라이버시"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "고급"
 
@@ -4285,7 +4294,7 @@ msgid "Authentication method"
 msgstr "인증 방법"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "자동"
 
@@ -4334,8 +4343,8 @@ msgstr "Message-ID 생성"
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " 편집..."
 
@@ -4358,7 +4367,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "보내기전 POP3와 인증"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "서명"
@@ -4652,287 +4661,297 @@ msgstr "동작 삭제"
 msgid "Do you really want to delete this action?"
 msgstr "정말로 이 동작을 삭제하시겠습니까?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "일반 설정 창을 생성합니다...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "일반 설정"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "보기"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "새 편지를 자동 검사"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 #, fuzzy
 msgid "every"
 msgstr "보이지 않음"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "분"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "시작할 때 새 편지를 검사"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "병합 후에 모든 지역 폴더 갱신"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "명령어"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "spool로부터 합체"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "합체시 필터링"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "보낸 메시지를 '보낸 편지함'에 저장"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "보내는 메일의 문자셋"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "보내는 메일의 문자셋"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "일반"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "서명 분리자"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "지동으로 삽입"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "회신"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "자동으로 회신할 계정 선택"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "회신할 때 메시지를 인용"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "회신 버튼이 메일링리스트에 대한 회신으로 동작"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "편집기"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "자동으로 외부 편집기 사용"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "줄 바꿈 at"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "글자"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "인용도 줄 바꿈"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 #, fuzzy
 msgid "Wrap on input"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "임시 보관함에 넣기"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "보통"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "회신 형식"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "인용 부호"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "전달 형식"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " 부호 설명 "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "기본 우편함"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "텍스트"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 #, fuzzy
 msgid "letters"
 msgstr "삭제"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "요약 보기"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "쓰레드 펴기"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "날짜 형식"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr "요약에 표시될 항목 설정... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "본문"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4941,11 +4960,11 @@ msgstr ""
 "`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
 "인코딩 방식이 사용됩니다."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "메시지에 색을 이용하여 보여주기"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4953,598 +4972,598 @@ msgstr ""
 "다중바이트 알파벳과 숫자를 ASCII 문자로\n"
 "표시 (일본어인 경우에만)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "메시지 보기 위에 헤더 창 표시"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "줄 간격"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "픽셀"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "스크롤"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "반 페이지"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "부드러운 스크롤"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "첨부된 이미지 크기 조정"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "표시될 헤더 설정"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "키 선택"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "폴더 삭제"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "폴더 삭제"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "자동으로 서명 확인"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "팝업 창에 서명 확인 결과 보이기"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "비밀번호를 메모리에 임시 보관"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 #, fuzzy
 msgid "Expired after"
 msgstr "나중에 보내기"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "분 "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "passphrase를 입력할때 Grab input"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "어떤 메시지 파일도 선택되지 않았습니다."
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "새 편지를 받은 후 받은 편지함으로 가기"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "시작할 때 새 편지를 검사"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(이것이 꺼져있는 경우 메시지는 실행때까지\n"
 "단지 표시만 될 것입니다)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "표시 명"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "기타"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "받기 대화상자"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "받기 대화상자 보기"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "항상"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "보이지 않음"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "받기 에러 발생시 에러 상자 보이지 않음"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "끝났을 때 받기 대화상자 닫기"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "더블클릭시에 대상에 주소 추가"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "끝낼때"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "끝냈때 확인"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "끝낼때 지운 편지함 비우기"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "지운 편지함 비울때 확인하기"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "큐에 메시지가 있을 때 경고"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "웹 탐색기"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "기본 우편함"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "합체을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "자동 (추천)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit 아스키 (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "유니코드 (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "서부 유럽(ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "중부 유럽(ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "터키 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "일본 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "일본 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "일본 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "중국 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "한국 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "년도 (년/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 #, fuzzy
 msgid "the preferred date for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 #, fuzzy
 msgid "Specifier"
 msgstr "파일 선택"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "설명"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "예제"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "메시지 색 설정"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "색"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "인용문 - 첫번째 단계"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "인용문 - 두번째 단계"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "인용문 - 세번째 단계"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI 링크"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "인용 색 반복"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "첫번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "두번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "세번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "URI 색 선택"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "부호 설명"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5568,11 +5587,11 @@ msgstr ""
 "뉴스그룹\n"
 "메시지-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5581,7 +5600,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5589,20 +5608,20 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "키 바인딩"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "기본"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "예전 Sylpheed"
 
diff --git a/po/lt.po b/po/lt.po
index 0bb0d65a..b911e732 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Nepageidautino pašto filtras (neautomatinis)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -829,7 +829,7 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
@@ -850,8 +850,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -870,21 +870,21 @@ msgstr "/_Failas/Išt_rinti"
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
@@ -916,7 +916,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -929,12 +929,12 @@ msgstr "/Į_rankiai/Importuoti _LDIF failą"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -952,7 +952,7 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +980,7 @@ msgstr "/Į_dėti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -1152,7 +1152,7 @@ msgstr "Adresų knygos konvertavimo klaida"
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Sąsaja"
 
@@ -1198,7 +1198,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1253,360 +1253,369 @@ msgstr "Ruda"
 msgid "None"
 msgstr "Nieko"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Pri_dėti..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Failas/_Siųsti"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Failas/Siųsti _vėliau"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Failas/Išsaugoti _juodraštį"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Failas/Išsaugoti ir _toliau redaguoti"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Failas/Prise_gti failą"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Failas/Įt_erpti failą"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Failas/Įterpti pa_rašą"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Failas/_Pridėti parašą"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Taisa/_Atšaukti"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Taisa/Pa_kartoti"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Taisa/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisa/Iškirp_ti"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisa/Įdėti kaip _citatą"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Taisa/Žymėti _viską"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Taisa/_Laužyti pastraipą"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Taisa/Laužyti _visas ilgas eilutes"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisa/_Automatiškai laužyti"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Ro_dymas"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/Ro_dymas/_Kam"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/Ro_dymas/Ko_pija"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/Ro_dymas/_Slapta kopija"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/Ro_dymas/Kam _atsakyti"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Ro_dymas/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/Ro_dymas/_Gija"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/Ro_dymas/_Liniuotė"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/Ro_dymas/Prise_gti failai"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr ""
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Ro_dymas/Simbolių ko_duotė"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Ro_dymas/Simbolių ko_duotė/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 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:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Į_rankiai/Naudoti išorinį redaktorių"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Į_rankiai/PGP _parašas"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Į_rankiai/PGP ši_fravimas"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/Į_rankiai/_Tikrinti rašybą"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Priedai"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1614,25 +1623,25 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1643,11 +1652,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1660,15 +1669,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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 "
@@ -1677,93 +1686,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1772,48 +1781,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -1993,7 +2002,7 @@ msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2294,7 +2303,7 @@ msgstr "Katalogų medžio perkūrimas nepavyko."
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Nepageidautinas"
 
@@ -4043,21 +4052,21 @@ msgstr "Sąskaitos nustatymai"
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privatumas"
 
@@ -4065,7 +4074,7 @@ msgstr "Privatumas"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Papildomi"
 
@@ -4189,7 +4198,7 @@ msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatinis"
 
@@ -4233,8 +4242,8 @@ msgstr "Generuoti „Message-ID“"
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Redaguoti... "
 
@@ -4259,7 +4268,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Parašas"
@@ -4567,85 +4576,85 @@ msgstr "Ištrinti veiksmą"
 msgid "Do you really want to delete this action?"
 msgstr "Ar tikrai norite ištrinti šį veiksmą?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Sukuriamas bendrų nustatymų langas...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Bendri nustatymai"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Vaizdas"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Nepageidautinas paštas"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Išsamiai"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automatiškai tikrinti paštą"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "kas"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minutė(s)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Tikrinti paštą paleidžiant"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Atnaujinti visus vietinius katalogus po prijungimo"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Vykdyti komandą kai gauti nauji laiškai"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Komanda"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "„%d“ bus pakeistas naujų laiškų skaičiumi."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Prijungti iš vietinio kaupo"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtruoti prijungiant"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Kelias iki kaupo"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Išsaugoti išsiųstus laiškus"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Filtruoti išsiųstus laiškus"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Siuntimo kodavimas"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4653,15 +4662,15 @@ msgstr ""
 "Nurodykite siuntimo kodavimą („Content-Transfer-Encoding“) naudojamą jei "
 "laiške yra ne „ASCII“ simbolių."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "MIME failų vardų koduotė"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME antraštė"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4671,171 +4680,181 @@ msgstr ""
 "MIME antraštė: populiariausias, bet neatitinka RFC 2047\n"
 "RFC 2231: atitinka standartą, bet nepopuliarus"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Bendras"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Parašo skirtukas"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Įterpti automatiškai"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Automatiškai pažymėti sąskaitą atsakymams"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Cituoti laiškus atsakant"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Mygtukas „Atsakyti“ atsako pašto konferencijai"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Redaktorius"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automatiškai paleisti išorinį redaktorių"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Atšaukimo lygis"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Laužyti eilutes kas"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "simboliai"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Laužyti citatas"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Laužyti įvedant"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Automatiškai išsaugoti į juodraščių katalogą"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Formatas"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Rašybos tikrinimas"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Atsakymo formatas"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Citavimo simbolis"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Persiuntimo formatas"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Simbolių paaiškinimas "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Įjungti rašybos tikrinimą"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Numatytoji kalba:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Teksto šriftas"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Katalogų peržiūra"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Rodyti neskaitytų laiškų skaičių šalia katalogo pavadinimo"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Rodyti laiškų skaičių stulpelius katalogų peržiūroje"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Sutrumpinti naujienų grupes ilgesnes nei"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "raidės"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Santrauka"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Rodyti gavėją lauke „Siuntėjas“, jei siuntėjas esate Jūs"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Išskleisti gijas"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Datos formatas"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Nustatyti santraukoje rodomus laukus... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Laiškas"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Numatytoji simbolių koduotė"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Naudojama kai koduotė nenurodyta laiške."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Siunčiamų laiškų koduotė"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4843,11 +4862,11 @@ msgstr ""
 "Jei pažymėta „Automatiškai“, bus naudojama optimali koduotė pagal esamą "
 "lokalę."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Spalvinti laiškus"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4855,84 +4874,84 @@ msgstr ""
 "Rodyti kelių baitų abėcėlę kaip ASCII simbolius\n"
 "(tik Japonų)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Rodyti antraščių langelį virš laiško"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Rodyti sutrumpintas antraštes"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Rodyti HTML laiškus kaip tekstą"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Rodyti HTML laiškus kaip tekstą"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Rodyti kursorių laiško peržiūroje"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Tarpas tarp eilučių:"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "taškas(-ai)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Slinkti"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Pusė puslapio"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Lygus slinkimas"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Žingsnis"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Paveikslėliai"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Keisti prisegtų paveikslėlių dydį, kad tilptų į langą"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Rodyti paveikslėlius laiške"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Įjungti nepageidautino pašto kontrolę"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Mokymosi komanda"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Pasirinkite nuostatas)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Pageidautinas"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Klasifikavimo komanda"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4940,205 +4959,205 @@ msgstr ""
 "Norėdami automatiškai klasifikuoti nepageidautiną paštą, turite išmokyti "
 "filtrą su pageidautinais ir nepageidautinais laiškais."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Nepageidautini"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Laiškai, pažymėti kaip nepageidautini, bus perkelti į šį katalogą."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Gaunant filtruoti laiškus, klasifikuotus kaip nepageidautinus"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtruoti nepageidautinus laiškus prieš įprastą filtravimą"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Ištrinti nepageidautinus laiškus iš serverio"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Pažymėti nepageidautinus laiškus kaip skaitytus"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automatiškai tikrinti parašą"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Rodyti parašo tikrinimo rezultatą naujame lange"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Laikinai saugoti slaptą frazę atmintyje"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Galiojimas"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minutė(s)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Nustatymas „0“ saugos slaptą frazę atmintyje visos sesijos metu."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Perimti įvesti, kai įvedama slapta frazė"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Rodyti perspėjimą startuojant, jei GnuPG neveikia"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Visuomet atidaryti santraukoje pasirinktus laiškus"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Atidaryti pirmą neskaitytą laišką einant į katalogą"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Prisiminti paskutinę pasirinktą žinutę"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Pažymėti laišką skaitytu tik jei ji atidaroma naujame lange"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Eiti į gaunamų laiškų katalogą po pašto gavimo"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Pradžioje atverti gaunamų laiškų katalogą"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Nedelsiant vykdyti laiškų perkėlimą ar trinimą"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Jei išjungta, laiškai bus pažymėti iki vykdymo."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Išdėstyti mygtukus pagal GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Rodyti piktogramą dėklėje"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Klavišų susiejimai... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Kiti"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Išorinės komandos"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Gavimo langas"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Rodyti gavimo langą"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Visuomet"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Tik kai gaunama rankiniu būdu"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Niekada"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Nerodyti klaidos lango po nesėkmingo gavimo"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Užverti langą baigus gavimą"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Įdėti adresus į paskirties katalogą dukart spragtelėjus"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Išeinant"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Patvirtinti išėjimą"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Išvalyti šiukšlinę išeinant"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Paklausti prieš išvalant"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Perspėti jei yra laiškų eilėje"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Išorinė komanda (%s bus pakeista failo vardu / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Naršyklė"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Numatytoji naršyklė)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Naudoti išorinę programą spausdinimui"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Naudoti išorinę programą sujungimui"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Naudoti išorinę programą siuntimui"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Įjungti griežtą santraukos laikinosios atminties vientisumo tikrinimą"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5147,275 +5166,275 @@ msgstr ""
 "Įjunkite, jei katalogų turinys gali būti modifikuotas kitų programų.\n"
 "Šis pasirinkimas sumažins santraukos rodymo greitį."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Prisijungimo skirtasis laikas"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "sekundė(s)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatiškai (Rekomenduojama)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unikodas (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Vakarų Europos (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Vakarų Europos (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Vakarų Europos (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Centrinės Europos (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Baltų (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Graikų (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabų (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabų (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajų (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajų (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkų (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonų (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonų (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonų (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Supaprastinta Kinų (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Supaprastinta Kinų (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicinė Kinų (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicinė Kinų (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinų (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korėjiečių (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tailandiečių (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tailandiečių (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "sutrumpinta savaitės diena"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "pilna savaitės diena"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "sutrumpintas mėnuo"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "pilnas mėnuo"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "pageidaujama data ir laikas esamai lokalei"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "amžius (metai/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "mėnesio diena"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "valanda (24)"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "valanda (12)"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "metų diena"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "mėnesio numeris"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minutės"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM / PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekundės"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "savaitės dienos numeris"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "pageidaujama data esamai lokalei"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "paskutiniai du metų skaitmenys"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "metai"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "laiko zona"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Simbolis"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Aprašymas"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Pavyzdys"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Nustatyti laiško spalvas"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Cituojams tekstas - Pirmas lygis"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Cituojams tekstas - Antras lygis"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Cituojams tekstas - Trečias lygis"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Nuoroda"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Atkurti citatos spalvas"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Pasirinkite spalvą pirmam citatos lygiui"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Pasirinkite spalvą antram citatos lygiui"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Pasirinkite spalvą trečiam citatos lygiui"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Pasirinkite nuorodos spalvą"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Simbolių apibūdinimas"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5439,11 +5458,11 @@ msgstr ""
 "Naujienų grupė\n"
 "Laiško ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Jei egzistuoja „x“, rodo „expr“"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5457,7 +5476,7 @@ msgstr ""
 "Cituojamas tekstas be parašo\n"
 "Simbolis %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5469,19 +5488,19 @@ msgstr ""
 "Atidarantys riestiniai skliaustai\n"
 "Uždarantys riestiniai skliaustai"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Klavišų susiejimai"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Pasirinkite klavišų susiejimų nuostatas."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Įprastas"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Senas „Sylpheed“"
 
diff --git a/po/nl.po b/po/nl.po
index 9550c68b..7e197d6c 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Troepfilter"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -839,7 +839,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
@@ -860,8 +860,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
@@ -926,7 +926,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -940,12 +940,12 @@ msgstr "/_Gereedschap/_LDIF bestand importeren"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -963,7 +963,7 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +993,7 @@ msgstr "/Be_werken/_Plakken"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -1174,7 +1174,7 @@ msgstr "Adresboek omzetprobleem"
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interface"
 
@@ -1220,7 +1220,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1275,364 +1275,373 @@ msgstr "Bruin"
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Bericht/_Verzenden"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Bericht/_Later verzenden"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Bericht/Klad _opslaan"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Bericht/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bestand _invoegen"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening invoegen"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Bericht/Handtekening _toevoegen"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/Be_werken/_Ongedaan maken"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/Be_werken/O_pnieuw toepassen"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Be_werken/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/Be_werken/K_nippen"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Be_werken/Plakken als _citaat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Be_werken/_Alles selecteren"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Be_werken/Regelterugloop in hele bericht"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Be_werken/Regel_terugloop"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Beel_d"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/Beel_d/_Aan"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/Beel_d/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/Beel_d/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/Beel_d/Ant_woord naar"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Beel_d/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/Beel_d/_Lineaal"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/Beel_d/_Bijlage"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Beel_d/_Tekstcodering"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Beel_d/_Tekstcodering/_Automatisch"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Beel_d/_Tekstcodering/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Beel_d/_Tekstcodering/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Beel_d/_Tekstcodering/Centraaleuropees (ISO-8859-2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Beel_d/_Tekstcodering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Beel_d/_Tekstcodering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Beel_d/_Tekstcodering/Thais (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Beel_d/_Tekstcodering/Thais (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Gereedschap/Be_werken met externe editor"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/_Ondertekenen met PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/_Coderen met PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Gereedschap/_Spellingscontrole"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal instellen"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Bijlagen"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1640,25 +1649,25 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1669,11 +1678,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1686,15 +1695,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1703,93 +1712,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1798,48 +1807,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2022,7 +2031,7 @@ msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr "Bladeren..."
 
@@ -2326,7 +2335,7 @@ msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Troep"
 
@@ -4108,21 +4117,21 @@ msgstr "Accountvoorkeuren"
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4130,7 +4139,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -4255,7 +4264,7 @@ msgid "Authentication method"
 msgstr "Identificatiemethode"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -4300,8 +4309,8 @@ msgstr "Bericht-ID aanmaken"
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr "Bewerken"
 
@@ -4326,7 +4335,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Identificatie met POP3 voor het verzenden"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Tekenen"
@@ -4636,85 +4645,85 @@ msgstr "Actie verwijderen"
 msgid "Do you really want to delete this action?"
 msgstr "Wilt u werkelijk deze actie verwijderen?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Venster algemene voorkeuren wordt aangemaakt...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Beeld"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Troep"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Details"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Iedere"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr " "
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuten kijken of er nieuwe e-mail is."
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Bij opstarten kijken of er nieuwe e-mail is"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Lokale mappen verversen na de verwerking"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Opdracht uitvoeren wanneer nieuwe e-mail binnenkomt"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Opdracht"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "'%d' zal vervangen worden door het aantal berichten."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Van lokale postbus overnemen"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filteren bij het ophalen"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Pad naar postbus"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Verzonden berichten opslaan in de outbox"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Filterregels op verzonden berichten toepassen"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Berichtcodering"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4722,15 +4731,15 @@ msgstr ""
 "Geef de Content-Transfer-Encoding die gebruikt wordt om het bericht te "
 "coderen wanneer deze speciale tekens bevat."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Codering voor MIME-bestandsnamen"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME header"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4740,174 +4749,184 @@ msgstr ""
 "MIME header: vaak gebruikt, maar overtreedt de RFC 2047 standaard\n"
 "RFC 2231: volgt de standaard, maar wordt minder gebruikt"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Algemeen"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Handtekening scheidingsteken"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Automatisch invoegen"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Account automatisch selecteren voor beantwoorden"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Originele bericht citeren bij beantwoorden"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwoorden roept de functie 'Discussielijst beantwoorden' aan"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automatisch extern programma starten voor bewerken van e-mail bericht"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "niveau van ongedaan maken"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Regelterugloop na:"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "tekens"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Regelterugloop gebruiken bij citeren"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Regelterugloop tijdens invoer"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Automatisch opslaan als klad"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Opmaak"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Spellingscontrole"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Antwoordopmaak"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Citeerteken"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Doorstuuropmaak"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Beschrijving der symbolen"
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Spellingscontrole gebruiken"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Standaardtaal:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Lettertype"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Mappenlijst"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Aantal berichten weergeven in mappenlijst"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Nieuwsgroepen inkorten die langer zijn dan"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "brieven"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Berichtenlijst"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Datumopmaak"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr "Kies kolommen voor berichtenlijst..."
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Bericht"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Standaard tekstcodering"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Dit wordt gebruikt voor het weergeven van berichten zonder meegestuurde "
 "tekencodering."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Uitgaande tekstcodering"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4915,11 +4934,11 @@ msgstr ""
 "Als 'Automatisch' is geselecteerd, wordt de meest optimale codering voor de "
 "huidige locale gebruikt."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Kleurmarkering in berichten aanzetten"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4927,84 +4946,84 @@ msgstr ""
 "Multi-byte tekens weergeven als ASCII tekens\n"
 "(alleen Japans)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "HTML als tekst weergeven"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "HTML als tekst weergeven"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Cursor weergeven in berichtveld"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Bijgevoegde afbeeldingen schalen naar venstergrootte"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Afbeeldingen in bericht weergeven"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Troep-beheer inschakelen"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Leeropdracht:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(kies instelling)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Geen troep"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Klassificatie-opdracht"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5012,216 +5031,216 @@ msgstr ""
 "Om troep automatisch te herkennen, moet het filter eerst getraind worden met "
 "zowel normale berichten als troep."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Troepmap"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Berichten die zijn aangemerkt als troep zullen hierheen verplaatst worden."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Troep filteren bij ophalen van berichten"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Troep van server verwijderen bij ophalen"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Troep van server verwijderen bij ophalen"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Gefilterde troep als gelezen markeren"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Controleer identificatiehandtekeningen automatisch"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Geef het resultaat van de controle weer in een popupvenster"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Wachtwoord tijdelijk in geheugen opslaan"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Verloopt na"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuten"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Instellen op '0' zal het wachtwoord tot het  einde van de sessie opslaan."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Berichten altijd openen in samenvattingsvenster wanneer geselecteerd"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
 "venster"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Bij opstarten kijken of er nieuwe e-mail is"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Berichten worden gemarkeerd voor deze acties wanneer dit uitgeschakeld is."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Volg de GNOME HIG met knoppenvolgorde"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Pictogram in mededelingengebied weergeven"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Diversen"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Externe opdrachten"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Ontvangstvenster"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Altijd"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Alleen bij handmatig ontvangen"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nooit"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen foutmelding geven bij ontvangstfout"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Ontvangstvenster sluiten wanneer het klaar is."
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Prullenbak leegmaken bij het afsluiten"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe opdrachten (%s is het bestand / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "Standaard webbrowser"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Extern programma gebruiken voor het verzenden"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Extern programma gebruiken voor verwerking van de e-mail"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Extern programma gebruiken voor het verzenden"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Nauwkeurige integriteitscontrole gebruiken bij samenvattingsbuffers"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5231,276 +5250,276 @@ msgstr ""
 "andere programma's.\n"
 "Deze optie zal prestatievermindering tot gevolg hebben."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O time-out:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "seconde(n)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (aanbevolen)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropees (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Westeuropees (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraaleuropees (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreeuws (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreeuws (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereenvoudigd Chinees (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "het uur als decimaal nummer op een 24 uurs klok"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "het uur als decimaal nummer op een 12-uurs klok"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5524,11 +5543,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5542,7 +5561,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5554,19 +5573,19 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr " Sneltoetsen instellen."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
diff --git a/po/pl.po b/po/pl.po
index a2810c2a..bd8737f3 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Niechciana poczta"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -829,7 +829,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
@@ -851,8 +851,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
@@ -917,7 +917,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -931,12 +931,12 @@ msgstr "/_Plik/Importuj plik _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -954,7 +954,7 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -984,7 +984,7 @@ msgstr "/_Edycja/_Wstaw"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -1169,7 +1169,7 @@ msgstr "Błąd konwersji książki adresowej"
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interfejs"
 
@@ -1215,7 +1215,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1270,370 +1270,379 @@ msgstr "Brązowy"
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Plik/Wyślij"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Plik/Wyś_lij później"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Plik/Zapisz w katalogu _szablonów"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Plik/Zapisz i kontynuuj _edycję"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Załączniki"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1641,26 +1650,26 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1670,12 +1679,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1693,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,93 +1710,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1797,51 +1806,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -2024,7 +2033,7 @@ msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2330,7 +2339,7 @@ msgstr "Błąd podczas odbudowywania drzewa katalogów."
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4081,21 +4090,21 @@ msgstr "Preferencje konta"
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Prywatność"
 
@@ -4103,7 +4112,7 @@ msgstr "Prywatność"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Zaawansowane"
 
@@ -4230,7 +4239,7 @@ msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -4280,8 +4289,8 @@ msgstr "Generowanie identyrikatora wiadomości"
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr "Edycja..."
 
@@ -4306,7 +4315,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Podpis"
@@ -4619,282 +4628,292 @@ msgstr "Usuń polecenie"
 msgid "Do you really want to delete this action?"
 msgstr "Czy naprawdę usunąć to polecenie?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Tworzenie okna preferencji...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Preferencje"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Wyświetlanie"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Niechciana poczta"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automatyczne sprawdzanie poczty"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "każde"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuta(y)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Sprawdzanie poczty przy uruchamianiu programu"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizacja wszystkich lokalnych katalogów po odebraniu"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Odbierz z kolejki"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrowanie przy odbieraniu"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Ścieżka do kolejki"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Zapisywanie wysłanych wiadomości do Poczta wysłana"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Kodowanie przesyłanych danych"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "Wybierz kodowanie dla listów, których treść zawiera znaki nie-ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Kodowanie wyjściowe"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Kodowanie wyjściowe"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Ogólne"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Automatyczne wstawianie podpisu"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Automatyczne ustawianie konta dla odpowiedzi"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Cytowanie wiadomości przy odpowiedzi"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk Odpowiedz wysyła odpowiedź na listę dyskusyjną"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automatyczne uruchamianie zewnętrznego edytora"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Poziom Cofnij"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomości przy"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "znakach"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Zawijanie cytatu"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Zawijanie podczas wprowadzania"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Zwykłe"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Format odpowiedzi"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Znak cytowania"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Format przekazywania"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Opis symboli "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Domyślny inbox"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Katalog"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skracanie nazwy grup dłuższych niż "
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "liter"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Widok listy wiadomości"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Rozwijanie wątków"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Ustaw element wyświetlania podsumowania... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4902,597 +4921,597 @@ msgstr ""
 "Jeśli wybrano `Automatyczne', zostanie użyte kodowanie optymalne dla "
 "bieżących ustawień lokalnych."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Włączenie kolorowania wiadomości"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Wyświetlanie znaków wielobajtowych jako ASCII (tylko japoński)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Wyświetlanie wiadomości HTML jako teskt"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Wyświetlanie wiadomości HTML jako teskt"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Pokaż kursor w widoku wiadomości"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Odstęp międzywierszowy"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Pół strony"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Wygładzone przewijanie"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Dopasuj rozmiar załączonych obrazków do rozmiaru okna"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Pokaż grafikę w treści"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Niechciana poczta"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Wybierz klucze"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "katalog:"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Usuń z serwera"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Usuń z serwera"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automatyczne sprawdzanie podpisów"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Wygasa po"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuta(y)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Wartość '0' ustawi zapamiętywanie hasła na czas całej sesji."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Wyświetlanie ostrzeżenia przy uruchamianiu gdy nie działa GnuPG"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr ""
 "Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do katalogu"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Zaznaczanie wiadomości jako odczytanych tylko po otwarciu w nowym oknie"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Sprawdzanie poczty przy uruchamianiu programu"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Gdy opcja ta jest wyłączona, wiadomości pozostaną zaznaczone do aż do "
 "momentu wykonania."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Wyświetlana nazwa"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Inne"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Wykonaj polecenie"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Okno dialogowe odbierania"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Wyświetlanie okna dialogowego odbierania"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Podczas wyjścia"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Potwierdzanie zamykania programu"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Opróżnianie śmietnika przy zamykaniu programu"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Wyświetlanie pytania przed opróżnieniem"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Domyślny inbox"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Użycie zewnętrznego programu do odbierania poczty"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu gniazda I/O:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "sekund(y)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatyczne (Zalecane)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitowe ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Śodkowa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bałtyckie (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Greckie (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajskie (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajskie (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tureckie (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japońskie (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japońskie (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japońskie (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczone Chińskie (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Uproszczone Chińskie (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjne Chińskie (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjne Chińskie (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chińskie (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Koreańskie (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tajskie (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tajskie (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dzień miesiąca jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skrót"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomości"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Łącze URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolorów cytowania"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5516,11 +5535,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomości"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Wyświetla expr jeśli ustawiono x"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5534,7 +5553,7 @@ msgstr ""
 "Ciało cytowanej wiadomości bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5546,20 +5565,20 @@ msgstr ""
 "Literalny nawias klamrowy otwierający\n"
 "Literalny nawias klamrowy zamykający"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Dowiązania klawiszy"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 993db2c6..7587a4df 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+0900\n"
 "PO-Revision-Date: 2007-07-20 09:44-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -512,11 +512,11 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
-#: libsylph/prefs_common.c:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de spam (manual)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -837,7 +837,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -858,8 +858,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
@@ -924,7 +924,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -937,12 +937,12 @@ msgstr "/_Ferramentas/Importar arquivo _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
@@ -960,7 +960,7 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +988,7 @@ msgstr "/Co_lar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -1165,7 +1165,7 @@ msgstr "Erro na conversão do catálogo de endereços"
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interface"
 
@@ -1211,7 +1211,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1266,360 +1266,369 @@ msgstr "Marrom"
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Enviar"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Arquivo/Enviar _depois"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arquivo/Salvar na pasta de _rascunhos"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arquivo/Salvar e _continuar editando"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Arquivo/Apender as_sinatura"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as _linhas compridas"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Cco"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/E_xibir/_Reply-To"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/E_xibir/_Followup-To"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/E_xibir/Cu_stomizar barra de ferramentas..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 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:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 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:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 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:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 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:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 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:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 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:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 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:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 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:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Ferramentas/Editar com editor e_xterno"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Assinar (PGP)"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Ferramentas/_Encriptar (PGP)"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/_Verificar ortografia"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Anexos"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1627,25 +1636,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 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:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1657,11 +1666,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1683,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1696,93 +1705,93 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1791,48 +1800,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2013,7 +2022,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2316,7 +2325,7 @@ msgstr "Falha ao tentar reconstruir a árvore de pastas."
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Spam"
 
@@ -4072,21 +4081,21 @@ msgstr "Preferências da Conta"
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -4094,7 +4103,7 @@ msgstr "Privacidade"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avançadas"
 
@@ -4218,7 +4227,7 @@ msgid "Authentication method"
 msgstr "Método de Autenticação"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automático"
 
@@ -4262,8 +4271,8 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4288,7 +4297,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar com POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Assinatura"
@@ -4596,86 +4605,86 @@ msgstr "Apagar ação"
 msgid "Do you really want to delete this action?"
 msgstr "Você realmente deseja apagar esta ação?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Criando janela de preferências comuns...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Preferências comuns"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Exibir"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Spam"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Checar nova mensagem"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "a cada"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Checar o correio quando iniciar"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Atualizar todas as pastas locais ao incorporar"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Executar comando quando chegarem novas mensagens"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' será substituído pelo número de novas mensagens."
 
 # alguma tradução boa para spool?
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Incorporar do spool local"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrar ao incorporar"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Caminho para o spool"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Salvar mensagens enviadas na Caixa de saída"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Aplicar regras de filtragem para as mensagens enviadas"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Codificação para transferência"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4683,15 +4692,15 @@ msgstr ""
 "Especifique a codificação de caracteres a ser usada quando a mensagem "
 "contiver caracteres não ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Codificação MIME de nome de arquivo"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "MIME header"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4702,172 +4711,182 @@ msgstr ""
 "MIME header: mais popular, mas viola a RFC 2047\n"
 "RFC 2231: respeita os padrões, mas não é tão popular"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Geral"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Inserir automaticamente"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Escolher conta para respostas automaticamente"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Quotar mensagem ao responder"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Botão de responder chama resposta para a lista"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Herdar destinatários ao responder mensagens próprias"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Executar o editor externo automaticamente"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Nível de desfazer"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Quebrar mensagens em"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Quebrar quote"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Quebrar na entrada"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Salvar automaticamente como rascunho"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Formato"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Corretor ortográfico"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Formato de resposta"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Marca de citação"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Formato de Mensagem Encaminhada"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Descrição dos símbolos "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Habilitar Corretor ortográfico"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Idioma padrão:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Fonte do texto"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Visualização de Pastas"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Exibir número de não lidas próximas ao nome da pasta"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Exibir colunas com o número de mensagens na visualização de pastas"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar newsgroups maiores que"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Visão de Sumário "
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Elementos visíveis no cabeçalho... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Codificação padrão de caracteres"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Isto é usado ao exibir mensagens que não indicam a codificação de caracteres."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Codificação de caracteres para envio"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4875,11 +4894,11 @@ msgstr ""
 "Se `Automático' for selecionado, a melhor codificação para o locale atual "
 "será usada."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensagem"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4887,84 +4906,84 @@ msgstr ""
 "Exibir alfabetos de 2-bytes e numéricos com \n"
 "caracteres ASCII (1-byte)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Exibir cabeçalho acima da visão da mensagem"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Cabeçalhos pequenos na visualização da mensagem"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Renderizar mensagens HTML como texto"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Renderizar mensagens HTML como texto"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Exibir cursor na área de visualização da mensagem"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Linha de espaço"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Meia página"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Rolagem silenciosa"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Imagens"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar imagens em anexo para que caibam na janela"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Dispor as imagens em seqüência"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Habilitar controle de spam"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Comando de aprendizado:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Selecionar pré-definido)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Não spam"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Comando de classificação"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4972,206 +4991,206 @@ msgstr ""
 "Para classificar SPAM automaticamente, deve-se treinar manualmente o "
 "classificador com uma quantidade razoável de SPAM e não-SPAM."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Pasta de spam"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "As mensagens classificadas como spam serão movidas para esta pasta."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensagens classificadas como spam ao receber"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrar SPAM antes da filtragem normal"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Apagar SPAMs do servidor ao receber"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Marcar SPAM filtrado como lido"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automaticamente checar assinatura"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Armazenar senha temporariamente na memória"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Expirado depois"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Definindo para '0' guardará a senha para toda a sessão."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Obter entrada quando informando uma passphrase"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Exibir aviso na inicialização se o GnuPG não funciona"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Sempre abrir mensagens no sumário quando selecionado"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Lembrar última mensagem selecionada"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Somente marcar a mensagem como lida quando aberta em uma nova janela"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Abrir a caixa de entrada após receber novas mensagens"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Abrir caixa de entrada ao iniciar"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Mensagens permanecerão marcadas até a execução se isto estiver desativado."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordenar os botões de acordo com o GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Exibir ícone de bandeja"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimizar para ícone de bandeja"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Alternar exibição da janela ao clicar no ícone da bandeja"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Outros"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Comandos externos"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Diálogo de recepção"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Exibir diálogo de recepção"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Apenas no recebimento manual"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Não mostrar diálogo de erro no caso de erros ao receber"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Fechar diálogo de recepção quando terminar"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar endereço para o destino quando clicado duas vezes"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Esvaziar lixeira ao sair"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Pergunte antes de esvaziar"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Avise se existirem mensagens na fila"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Navegador padrão)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Usar programa externo para imprimir"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Usar um programa externo para obter mensagens"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Habilitar verificação rigorosa da integridade dos caches do sumário"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5182,275 +5201,275 @@ msgstr ""
 "Esta opção reduzirá o desempenho de exibição do sumário."
 
 # tradução boa para socket?
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Tempo limite de E/S no socket:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeu Ocidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeu Ocidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Europeu Ocidental (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Europeu Central (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Báltico (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arábico (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arábico (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinês simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do mês abreviado"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "o nome do mês abreviado"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "a data é hora preferida para a localização atual"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 24 horas"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 12 horas"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "o minuto como um número decimal"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "o segundo como um número decimal"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localização atual"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "os últimos dois dígitos de um ano"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "o ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abreviação"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Descrição"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro Nível"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo Nível"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro Nível"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Ligação URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quotação nível 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quotação nível 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quotação nível 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5475,11 +5494,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5493,7 +5512,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5505,19 +5524,19 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Selecione o conjunto pré-definido de mapeamento de teclas."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
diff --git a/po/ro.po b/po/ro.po
index 792a6b5a..9a67d4df 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+0900\n"
 "PO-Revision-Date: 2007-12-22 00:31+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Filtru mesaj spam (manual)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 msgid "Junk mail filter"
 msgstr "Filtru mesaj spam"
 
@@ -694,7 +694,7 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda 'Verifică tot'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -851,7 +851,7 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați folderul pentru agendă"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
@@ -872,8 +872,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -892,22 +892,22 @@ msgstr "/_Fișier/Ș_terge"
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
@@ -939,7 +939,7 @@ msgstr "/A_dresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
@@ -952,12 +952,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
@@ -975,7 +975,7 @@ msgid "/New _Folder"
 msgstr "/_Folder nou"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -1004,7 +1004,7 @@ msgstr "/Li_pește"
 msgid "E-Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1180,7 +1180,7 @@ msgstr "Eroare de conversie a agendei"
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Interfață"
 
@@ -1226,7 +1226,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1283,364 +1283,373 @@ msgstr "Maro"
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Adăugă..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/Ște_rge"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Proprietăți..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Fișier/_Trimite"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Fișier/Trimite _mai târziu"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fișier/Salvează în folderul _ciorne"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fișier/_Salvează și continuă editarea"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Fișier/_Atașează un fișier"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Fișier/_Inserează un fișier"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fișier/Inserea_ză semnătura"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Fișier/Adau_gă semnătura"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulează"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Refă"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Taie"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/_Lipește ca citat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Selecte_ază tot"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editare/_Desparte paragraful curent"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Desparte _liniile lungi"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/Desparte liniile aut_omat"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Vizualizare"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Vizualizare/Că_tre"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Vizualizare/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Vizualizare/_Bcc"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/_Vizualizare/_Răspuns către"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
 # hm ?
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/_Vizualizare/_Urmărește"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Vizualizare/Ri_glă"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Vizualizare/_Atașament"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vizualizare/Personalizează bara de _unelte..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Vizualizare/Codare caract_ere"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Vizualizare/Codare caract_ere/_Automat"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/Codare caract_ere/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vizualizare/Codare caract_ere/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vizualizare/Codare caract_ere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/Codare caract_ere/Greek (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/Codare caract_ere/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinses (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Șablon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acțiu_ni"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Unelte/Editare cu editor e_xtern"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Unelte/Semnează P_GP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Unelte/Cr_iptează PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Unelte/Verifi_că ortografia"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Eroare de format al mesajului de răspuns sau înaintat."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Îl trimt oricum ?"
 
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Atașamente"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
 # hm ?
-#: src/compose.c:2904
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1648,26 +1657,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în 'Trimise'."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate '%s'."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1679,11 +1688,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1696,15 +1705,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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 "
@@ -1718,93 +1727,93 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru editor extern nu este validă: '%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,49 +1822,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2036,7 +2045,7 @@ msgstr "Editare înregistrare JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2341,7 +2350,7 @@ msgstr "Reconstrucția arborelui de foldere a eșuat."
 msgid "Checking for new messages in all folders..."
 msgstr "Verifică pentru mesaje noi în toate folderele..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Spam"
 
@@ -4122,23 +4131,23 @@ msgid "Creating account preferences window...\n"
 msgstr "Creare fereastră de preferințe cont...\n"
 
 # obs: tab-ul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Primire"
 
 # obs: comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Trimite"
 
 # obs: comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Compune"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Confidențialitate"
 
@@ -4146,7 +4155,7 @@ msgstr "Confidențialitate"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avansat"
 
@@ -4270,7 +4279,7 @@ msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automat"
 
@@ -4316,8 +4325,8 @@ msgstr "Generează câmpul 'Message-ID'"
 msgid "Add user-defined header"
 msgstr "Adaugă antet definit de utilizator"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Editare... "
 
@@ -4342,7 +4351,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autentifică cu POP3 înainte de a trimite"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Semnătură"
@@ -4654,89 +4663,89 @@ msgstr "Șterge acțiune"
 msgid "Do you really want to delete this action?"
 msgstr "Chiar vreți să ștergeți această acțiune ?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Creare fereastră preferințe comune...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Preferințe comune"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Afișare"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Spam"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Detalii"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Verifică automat pentru eventuale mesaje noi"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "la fiecare"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Verifică pentru eventuale mesaje noi la pornirea programului"
 
 # ???
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Actualizează toate folderele locale după încorporare"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Execută o comandă la primirea de noi mesaje"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Comandă"
 
 # adică cum ?
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "'%d' va fi înlocuit cu numărul noilor mesaje"
 
 # hm ?
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Încorporează din spool-ul local"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtru la încorporare"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Cale spool"
 
 # !!! depinde de traducerea lui Outbox !!!
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Salvează mesajele trimise în folderul 'Trimise'"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Aplică regulile de filtrare pentru mesajele trimise"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Codare de transfer"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4744,15 +4753,15 @@ msgstr ""
 "Specifică 'Content-Transfer-Encoding'-ul folosit atunci când corpul "
 "mesajului conține caractere non-ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Codare de nume fișier MIME"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Antet MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4763,179 +4772,189 @@ msgstr ""
 "Antet MIME: cel mai popular, dar violează RFC 2047\n"
 "RFC 2231: conform standardului, dar nepopular"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "General"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Separator de semnătură"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Inserează automat"
 
 # obs: comun și pentru butonul de pe toolbar și pentru chenarul din common preferencews... -> compose -> general
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Răspunde"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Selecteză automat contul pentru răspunsuri"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citează mesajul la care se răspunde"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Butonul de răspuns invocă răspuns la lista de discuții"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Păstrează destinatarii inițiali când se răspunde la mesaje proprii"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Lansează automat editorul extern"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Nivele de anulare"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Desparte liniile mesajelor la"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "caractere"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Desparte liniile lungi citate"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Desparte liniile lungi în timpul compunerii"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Salvează automat în ciorne"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Format"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Verificare sintaxă"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Format de răspuns"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Semn de citare"
 
 # hm ?
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Format de înaintare"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Descrierea simbolurilor "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Activează verificarea ortografică"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Limbă implicită:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Font text"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Vizualizare foldere"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Afișează numărul de mesaje necitite lângă numele folderului"
 
 # hm ?
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Afișează coloanele cu numerele de mesaje"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviază grupurile de știri mai lungi decât"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "litere"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Vizualizare sumară"
 
 # hm ? sensul original poate fi incorect în anumite situații; ar trebui ceva de genul dacă expeditorul este totuna cu proprietarul contului
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afișează destinatarul în coloana 'Expeditor', dacă expeditorul sunteți "
 "dumneavoastră"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Desfășoară firul discuțiilor"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Format dată"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Alegere elemente afișate ale sumarului... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Mesaj"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Codare implicită de caractere"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Se utilizează la afișarea mesajelor cărora la lipsește informația de codare "
 "a caracterelor."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Codare de caractere la trimitere"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4943,11 +4962,11 @@ msgstr ""
 "Dacă este selectat 'Automat', se va utiliza codarea optimă pentru localele "
 "curente."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Activează colorarea mesajelor"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4955,84 +4974,84 @@ msgstr ""
 "Afișează alafbetul și numerele de tip octet multiplu\n"
 "ca caractere ASCII (numai japoneză)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Afișează panou de antet deasupra ferestrei de vizualizare a mesajului"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Afișează antet scurt în fereastra de vizualizare a mesajului"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Randează mesajul HTML ca text"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Randează mesajul HTML ca text"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Afișează cursorul în vizualizarea mesajului"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Spațiere linii"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(i)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Derulare"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Jumătate de pagină"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Derulare lină"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Pas"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Imagini"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionează imaginile atașate pentru a încăpea în fereastră"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Afișează imaginile intercalat"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Activează controlul mesajelor spam"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Învățare comandă:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Selectează predefinit)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Nu e spam"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Comandă clasificare"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5040,209 +5059,209 @@ msgstr ""
 "Pentru a clasifica mesajele ca spam în mod automat, și mesajele spam și "
 "mesajele utile trebuie învățate manual într-o anumită măsură."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Folder spam"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Mesajele care sunt marcate ca spam vor fi mutate în acest folder."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrează la primire mesajele clasificate ca spam"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrează mesajele spam înaintea filtrării normale"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Șterge mesajele spam de pe server la primire"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Marchează mesajele spam filtrate ca fiind citite"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Verifică semnăturile automat"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Arată rezultatul verificării semnăturii într-o fereastră de tip pop-up"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Stochează temporar fraza secretă în memorie"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Expiră după"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Selectarea valorii '0' determină memorarea frazei secrete pentru întreaga "
 "sesiune."
 
 # hm ?
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Ascunde intrarea în timp ce se introduce fraza secretă"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Avertizează la pornire dacă GnuPG nu funcționează"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Deschide totdeauna mesajele în mod sumar când sunt selectate"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Deschide primul mesaj necitit la deschiderea unui folder"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Ține minte ultimul mesaj selectat"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marchează mesajul ca fiind citit doar când este deschis în fereastră nouă"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Deschide folderul 'Primite' (Inbox) după primirea de mesaje noi"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Deschide folderul 'Primite' (Inbox) la pornirea programului"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Execută imediat când se mută sau se șterg mesaje"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Dacă opțiunea este deselectată, mesajele vor fi mai înâi marcate."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Determină ordinea butoanelor să fie în concordanță cu GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Afișează icon în zona de notificare"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Minimizează pe iconul din zona de notificare"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Comută fereastra la clic pe iconul din zona de notificare"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Alegere temă de combinaţii de taste... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Altele"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Comenzi externe"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Dialog de primire"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Arată dialogul de primire"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Întotdeauna"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Numai la primire manuală"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Niciodată"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Nu deschide dialog de eroare de tip pop-up în caz de eroare la primire"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Închide dialogul de primire la terminarea operației"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 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"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "La ieșire"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Cere confirmare de închidere a programului"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Golește gunoiul la ieșire"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Cere confirmare înainte de golire"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Avertizează dacă sunt mesaje la coadă"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comenzi externe (%s va fi înlocuit de nume fișier / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Browser Web"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Browser implicit)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Folosește un program extern pentru tipărire"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Folosește un program extern pentru încorporare"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Folosește un program extern pentru trimitere"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activează verificarea strictă a integrității cache-ului sumarului"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5252,275 +5271,275 @@ msgstr ""
 "fi modificat de alte aplicații.\n"
 "Această opțiune va degrada performanța de afișare a sumarului."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Timpul Socket I/O a expirat:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "secundă(e)"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automat (recomandat)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Western European (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Baltic (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabic (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Arabic (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrew (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "numele abreviat al zilei săptămânii"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "numele complet al zilei săptămânii"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "numele abreviat al lunii"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "numele complet al lunii"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "data și timpul preferat pentru localele curente"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "numărul secolului (an/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "ziua săptămânii ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ora ca număr zecimal utilizând formatul de 24 ore"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ora ca număr zecimal utilizând formatul de 12 ore"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "ziua anului ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "luna ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minutul ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "indiferent AM sau PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "secunda ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "ziua săptămânii ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "data preferată pentru localele curente"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "ultimii doi digiți ai numărului anului"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "anul ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "timpul zonal sau numele sau abrevierea"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Specificator"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Descriere"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Exemplu"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Stabilire culori mesaj"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Culori"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citat - primul nivel"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citat - nivelul al doilea"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citat - nivelul al treilea"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Reciclează culori citat"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Alege culoarea pentru citatul de nivel 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Alege culoarea pentru citatul de nivel 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Alege culoarea pentru citatul de nivel 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Alege culoarea pentru URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Descrierea simbolurilor"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5545,11 +5564,11 @@ msgstr ""
 "ID-mesaj"
 
 # ???
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Dacă x este setat, afișează expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5564,7 +5583,7 @@ msgstr ""
 "Caracterul %"
 
 # sau linie ?
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5576,19 +5595,19 @@ msgstr ""
 "Caracterul {\n"
 "Caracterul }"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Combinaţii de taste"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Selectaţi tema predefinită pentru combinaţiile de taste."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Implicit"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Sylpheed vechi"
 
diff --git a/po/ru.po b/po/ru.po
index 38828d39..514038d8 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Фильтр спама"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -834,7 +834,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
@@ -855,8 +855,8 @@ msgstr "/Файл/Новый файл JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
@@ -921,7 +921,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -934,12 +934,12 @@ msgstr "/Инструменты/Импорт файла LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
 msgstr "/Новая папка"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -985,7 +985,7 @@ msgstr "/Вставить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -1160,7 +1160,7 @@ msgstr "Ошибка преобразования адресной книги"
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -1206,7 +1206,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1261,360 +1261,369 @@ msgstr "Коричневый"
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Добавить..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/Файл/Отправить"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/Файл/Отправить позже"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Сохранить в папке черновиков"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Сохранить и продолжить правку"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/Файл/Вложить файл"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставить текст из файла"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставить подпись"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Добавить подпись в конец"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/Правка/Отменить"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Повторить"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить всё"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Правка/Отформатировать абзац"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Правка/Отформатировать всё сообщение"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Вид"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/Вид/Кому"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/Вид/Копия"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/Вид/Адрес для ответа"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вид/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/Вид/Следовать к"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/Вид/Линейка"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вид/Настроить панель инструментов"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Кодировка"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Кодировка/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вид/Кодировка/Балтийская (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вид/Кодировка/Арабская (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Иврит (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Иврит (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллица (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Кириллица (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Кириллица\\/Украина (KOI8-_U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллица (_Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Китайская традиционная (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/Инструменты/Проверить орфографию"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Язык для проверки орфографии"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Вложения"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1622,25 +1631,25 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1651,11 +1660,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1668,15 +1677,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1689,93 +1698,93 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1785,48 +1794,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2006,7 +2015,7 @@ msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2308,7 +2317,7 @@ msgstr "Ошибка при перестройке дерева папок."
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Спам"
 
@@ -4062,21 +4071,21 @@ msgstr "Настройки учётной записи"
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Приём"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Отправить"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Написать"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Защита"
 
@@ -4084,7 +4093,7 @@ msgstr "Защита"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Дополнительно"
 
@@ -4208,7 +4217,7 @@ msgid "Authentication method"
 msgstr "Метод аутентификации"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -4252,8 +4261,8 @@ msgstr "Создавать Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Определить... "
 
@@ -4278,7 +4287,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Проверка пароля через POP3 перед отправкой"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Подпись"
@@ -4585,85 +4594,85 @@ msgstr "Удалить действие"
 msgid "Do you really want to delete this action?"
 msgstr "Вы действительно хотите удалить это действие?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Создание окна общих настроек...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Общие настройки"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Отображение"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Спам"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Прочее"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Проверять приход новых сообщений"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "каждые"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "минут"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Проверять приход новых сообщений при запуске"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Обновить все локальные папки после приёма"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Выполнять команду, когда поступили новые сообщения"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "\"%d\" будет заменено на число новых сообщений."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Принимать из спула"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Фильтровать при приёме"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Путь к спулу"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Сохранять отправленные сообщения в папке \"Отправленные\""
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Применять фильтры к отправленным сообщениям"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Кодирование текста сообщений"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4671,15 +4680,15 @@ msgstr ""
 "Укажите метод кодирования текстов сообщений, содержащих символы не из "
 "диапазона ASCII (Content-Transfer-Encoding)."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Кодирование имён файлов в MIME"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Заголовок MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4691,173 +4700,183 @@ msgstr ""
 "\"RFC 2231\" - метод, соответствующий стандартам Internet, но не работающий "
 "с некоторыми несвободными почтовыми программами."
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Общие"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Разделитель подписи"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Добавлять автоматически"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Автоматически выбирать учётную запись при ответе"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Цитировать при ответе"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "По кнопке \"Ответить\" отвечать в список рассылки"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Включить получателей при ответе нв письмо себе"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Автоматически запускать внешний редактор"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Число уровней отката"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Переносить строки с"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "символа"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Переносить цитаты"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Переносить при вводе"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Автоматически сохранять в папке черновиков"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Формат"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Проверка орфографии"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Формат ответа"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Знак цитаты"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Формат пересылаемого сообщения"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Описание символов "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Проверять орфографию"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Язык по умолчанию:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Шрифт для текста"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Дерево папок"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Отображать столбцы с числом сообщений в дереве папок"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Сокращать названия групп новостей длиннее"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "букв"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Список сообщений"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показывать получателя в колонке \"От\", если отправитель - вы"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Разворачивать обсуждения"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Формат даты"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr "Установить отображаемые поля..."
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Кодировка по умолчанию"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Эта кодировка используется для отображения сообщений, в которых отсутствует "
 "явное указание кодировки."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Кодировка для отправляемых сообщений"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4865,11 +4884,11 @@ msgstr ""
 "При выборе варианта \"Автоматически\" будет использована оптимальная "
 "кодировка для текущего языка и страны."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Разрешить раскраску сообщений"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4877,84 +4896,84 @@ msgstr ""
 "Отображать многобайтовые алфавитно-цифровые символы\n"
 "как ASCII (только для японских кодировок)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Показывать панель заголовков над областью просмотра сообщений"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Показывать сокращённые заголовки при просмотре сообщений"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Отображать сообщения в формате HTML как текст"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Отображать сообщения в формате HTML как текст"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Отображать курсор в области просмотра сообщения"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Расстояние между строками"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "пикселей"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Половина страницы"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Плавная прокрутка"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Шаг"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Изображения"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабировать присоединённые изображения по размеру окна"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Показывать изображения в тексте сообщения"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Включить автоматическую фильтрацию спама"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Команды для обучения:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Выберите стандартную настройку)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Не спам"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Команда классификации"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4963,207 +4982,207 @@ msgstr ""
 "отметить вручную некоторое количество сообщений, как являющихся, так и не "
 "являющихся спамом."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Папка для спама"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Сообщения, помеченные как спам, будут перемещены в эту папку."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Проверять сообщения на спам при приёме"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Удалять обнаруженный спам перед фильтрацией сообщений"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Удалять обнаруженный спам с сервера при приёме"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Помечать отфильтрованный спам как прочитанный"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Автоматически проверять подписи"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Показывать результат проверки подписи в отдельном окне"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Сохранять парольную фразу в памяти"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Удалять через"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "минут"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "При установке в 0 парольная фраза будет храниться в течение всего сеанса."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Захватить ввод при запросе пароля"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Открыть первое непрочитанное сообщение при входе в папку"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Запомнить последнее выбранное сообщени"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Перейти в папку \"Входящие\" после приёма новых сообщений"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Открыть папку новых сообщений при запуске"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Немедленно выполнять перемещение и удаление сообщений"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Сообщения будут просто помечены до выполнения, если эта опция не включена."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Размещать кнопки в окнах в соответствии с правилами GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Отображать значок на панели"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Свернуть в панель задач"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Развернуть окно по щелчку на иконке"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Другое"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Внешние команды"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Окно приёма сообщений"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Показывать окно приёма сообщений"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Всегда"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Только при запуске приема сообщений вручную"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Никогда"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Не отображать сообщение об ошибке при получении сообщений"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Закрывать окно приёма сообщений после завершения"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Добавлять адрес в список адресатов по двойному щелчку"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "При выходе"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Запрашивать подтверждение при выходе"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Очищать корзину при выходе"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Спрашивать перед очисткой"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии сообщений в очереди"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Внешние команды (%s будет заменено на имя файла/URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Браузер по умолчанию)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Использовать внешнюю программу для печати"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Использовать внешнюю программу для приёма почты"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Использовать внешнюю программу для отправки почты"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Проверять целостность кеша списка сообщений"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5173,275 +5192,275 @@ msgstr ""
 "программами.\n"
 "Включение проверки замедляет отображение списков сообщений."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Время ожидания ответа из сети:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Автоматически (Рекомендуется)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 бит ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропейская (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропейская (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Западноевропейская (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Центральноевропейская (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Прибалтийская (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Прибалтийская (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Балтика (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арабская (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Арабская (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Иврит (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Иврит (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кириллица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кириллица (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кириллица/Украина (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кириллица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японская (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Японская (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Японская (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Китайская упрощённая (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Китайская упрощённая (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Китайская традиционная (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Китайская традиционная (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайская (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Тайская (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Тайская (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "сокращённое название дня недели"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "полное название дня недели"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "сокращённое название месяца"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "полное название месяца"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "предпочтительный формат даты и времени для выбранной страны"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "век (год/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "день месяца"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час, 24-часовое представление"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час, 12-часовое представление"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "день года"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "номер месяца"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "минута"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "секунда"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "номер дня недели"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "предпочтительный формат даты для выбранной страны"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "последние две цифры года"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "год полностью"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "имя или сокращение временной зоны"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Элемент формата"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Настройка цветов сообщений"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Цитата - Первый уровень"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Цитата - Второй уровень"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Цитата - Третий уровень"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Ссылка (URI)"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Циклически использовать цвета цитат"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Выберите цвет для цитат уровня 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Выберите цвет для цитат уровня 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Выберите цвет для цитат уровня 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Выберите цвет для ссылок (URI)"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Описание символов"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5465,11 +5484,11 @@ msgstr ""
 "Группы новостей\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Если x установлено, отображает expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5483,7 +5502,7 @@ msgstr ""
 "Содержимое сообщения без подписи со знаком цитаты\n"
 "Символ \"%\""
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5495,19 +5514,19 @@ msgstr ""
 "Символ \"{\"\n"
 "Символ \"}\""
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Клавиатурные команды"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Выберите вариант настройки клавиатурных команд."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Старые версии Sylpheed"
 
diff --git a/po/sk.po b/po/sk.po
index edd98f75..1ef36e5c 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Priečinok"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -831,7 +831,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
@@ -853,8 +853,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -873,21 +873,21 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
@@ -919,7 +919,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -933,12 +933,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -956,7 +956,7 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -986,7 +986,7 @@ msgstr "/Úp_ravy/_Prilepiť"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -1170,7 +1170,7 @@ msgstr "Chyba pri konverzii adresára"
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Ovládanie"
 
@@ -1216,7 +1216,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1271,402 +1271,411 @@ msgstr "Hnedá"
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Prílohy"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,25 +1683,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1712,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1726,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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,95 +1743,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1832,52 +1841,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2061,7 +2070,7 @@ msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2370,7 +2379,7 @@ msgstr "Obnova stromu priečinku sa nepodarila."
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4153,21 +4162,21 @@ msgstr "Nastavenie konta"
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Súkromie"
 
@@ -4175,7 +4184,7 @@ msgstr "Súkromie"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Rozšírené"
 
@@ -4303,7 +4312,7 @@ msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatická"
 
@@ -4353,8 +4362,8 @@ msgstr "Generovať Message-ID"
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Upresniť... "
 
@@ -4380,7 +4389,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Podpis"
@@ -4693,88 +4702,88 @@ msgstr "Zmazať akciu"
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Vytváram okno všeobecných nastavení...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Automaticky zisťovať novú poštu"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "každých"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minút"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Prijať lokálnu poštu zo spoolu"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrovať pri prijímaní lokálnej pošty"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Uložiť odoslané správy"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4783,196 +4792,206 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá,\n"
 "keď bude správa obsahovať iné znaky ako ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Vložiť automaticky"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Automaticky zvoliť konto pri odpovedaní"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Pri odpovedaní citovať správu"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Počet spätných krokov"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Zalomiť správy na"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "znakoch"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Zalomiť citáciu"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Zalamovať pri písaní"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Uložiť medzi koncepty"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Obyčajný"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Formát odpovede"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Značka citácie"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Popis znakov "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Východzí inbox"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Text"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "písmen"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Zoznam správ"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Rozbaliť vlákna"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Správa"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4981,607 +5000,607 @@ msgstr ""
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
 "pre súčasnú lokalizáciu."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Zobraziť viacbajtovú abecedu a čísla ako ASCII znaky (len Japonsko)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Prispôsobiť veľkosť priložených obrázkov"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Zvoľte kľúče"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Odstrániť priečinok"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Odstrániť priečinok"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Zobraziť výsledok overenia ako upozornenie"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Vymazať z pamäte za"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minút "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavte na '0', ak chcete uložiť heslo do pamäte\n"
 " až do ukončenia)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Žiadne zafarbené správy"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Správy budú označené až do vykonania,\n"
 " ak je táto možnosť vypnutá)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Zobraziť meno"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Ostatné"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Okno prijímania"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Východzí inbox"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Použiť externý program pre prijímanie lokálnej pošty"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "sekúnd"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5605,11 +5624,11 @@ msgstr ""
 "Diskusné skupiny\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadané, zobrazí expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5623,7 +5642,7 @@ msgstr ""
 "Telo citovanej správy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5635,20 +5654,20 @@ msgstr ""
 "Ľavá zložená zátvorka\n"
 "Pravá zložená zátvorka"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
diff --git a/po/sl.po b/po/sl.po
index 41a40cd8..046951d1 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Mapa"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -837,7 +837,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -859,8 +859,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
@@ -925,7 +925,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -939,12 +939,12 @@ msgstr "/_Orodja/Uvoz datoteke _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -962,7 +962,7 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -992,7 +992,7 @@ msgstr "/_Uredi/_Prilepi"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -1175,7 +1175,7 @@ msgstr "Napaka pri pretvorbi imenika naslovov"
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Vmesnik"
 
@@ -1221,7 +1221,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1276,403 +1276,412 @@ msgstr "Rjava"
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Priloge"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1680,25 +1689,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1708,12 +1717,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1722,15 +1731,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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,96 +1748,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1838,52 +1847,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2066,7 +2075,7 @@ msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2375,7 +2384,7 @@ msgstr "Ponovno gradim drevo map..."
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4156,21 +4165,21 @@ msgstr "Nastavitve računa"
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Zasebnost"
 
@@ -4178,7 +4187,7 @@ msgstr "Zasebnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4306,7 +4315,7 @@ msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -4355,8 +4364,8 @@ msgstr "Generiran ID sporočila"
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4382,7 +4391,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Pred pošiljanjem avtenticiraj s POP3"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Podpis"
@@ -4693,284 +4702,294 @@ msgstr "Izbriši dejanje"
 msgid "Do you really want to delete this action?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Ustvarjam okno za splošne nastavitve...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Splošne nastavitve"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Samodejno preverjanje nove pošte"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "vsak"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Preveri novo pošto ob zagonu"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Posodobi vse lokalne mape po pripojitvi"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Pripoji iz spoola"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtriranje ob pripojitvi"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Shrani poslana sporočila v izhodno mapo"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Izhodni nabor znakov"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Izhodni nabor znakov"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Splošno"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Ločilo podpisa"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Vrini samodejno"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Samodejno izberi račun za odgovore"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citiraj sporočila ob odgovarjanju"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Samodejni zaženi zunanji urejevalnik"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Razveljavi nivo"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Prelom sporočila ob"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "znakov"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Prelom citata"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Prelomi ob vnosu"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Shrani v imenik Draft"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normalno"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Oblika odgovora"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Znak za citiranje"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Oblika posredovanja"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr "Opis simbolov"
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Besedilo"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrajšaj novičarske skupine daljše od"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "Izbriši"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Ogled povzetka"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Razširi niti"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Oblika datuma"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr "Nastavi del za prikaz povzetka..."
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Sporočila"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4979,11 +4998,11 @@ msgstr ""
 "Če je izbrano `Samodejno', bo uporabljeno\n"
 "optimalno kodiranje za trenutni locale."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Omogoči barvanje sporočila"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4991,598 +5010,598 @@ msgstr ""
 "Prikaži večzložno abecedo in števila kot\n"
 "znake ASCII (samo japonščina)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavje nad ogledom sporočila"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Prostor za vrstico"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "točk(e)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Drsenje"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Polovica strani"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Nadzor gladkosti"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Spremeni velikost pripetim slikam"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Nastavitev prikaza zaglavja"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Izberite ključ"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Izbriši mapo"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Izbriši mapo"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Samodejno preveri podpise"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Začasno shrani prepustno frazo v pomnilnik"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Poteče po"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minut(e) "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavitev na '0' bo shranila prepustno frazo\n"
 " za celotno sejo)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Zagrabi vnos med vnašanjem gesla"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nobena datoteka s sporočilom ni izbrana."
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Ni več sporočil z oznako"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Označi sporočilo kot prebrano samo, ko je odprto v novem oknu"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Preveri novo pošto ob zagonu"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Sporočila bodo označena do izvršitve,\n"
 "če je to izklopljeno)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Prikaži ime"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Dialog za sprejem"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Prikaži pogovorno okno za sprejem"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Vedno"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Na koncu zapri pogovorno okno za sprejemanje"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Ob dvojnem kliku dodaj naslov na cilj"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Potrdi ob izhodu"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Izprazni smetnjak ob izhodu"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Vprašaj pred izpranjenjem"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Opozori, če so čakajoča sporočila"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Uporabi zunanji program za vključitev"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Samodejno (priporočeno)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitni ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Zahodnoevropski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednjeevropski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltski (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turški (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitajščina (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitajščina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "polno okrajšano ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "okrajšano ime meseca"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznejša oblika datuma in časa za trenutni locale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "številka stoletja (leto/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ura kot desetiško število s 24-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ura kot desteiško število z 12-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "mesec kot desetiško število"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minute kot desetiško število"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekunde kot desetiško število"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "najustreznejši datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "zadnji dve števki leta"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "leto kot desetiško število"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "časovni pas ali ime ali okrajšava"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Določevalec"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5606,11 +5625,11 @@ msgstr ""
 "Novičarske skupine\n"
 "ID sporočila"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Če je x nastavljen, prikaži expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5624,7 +5643,7 @@ msgstr ""
 "Telo citiranega sporočila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5636,20 +5655,20 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
diff --git a/po/sr.po b/po/sr.po
index 5539ae50..cf126ef8 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Direktorijum"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -837,7 +837,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -859,8 +859,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
@@ -925,7 +925,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -939,12 +939,12 @@ msgstr "/_Datoteka/Unesi _LDIF datoteku"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -962,7 +962,7 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -992,7 +992,7 @@ msgstr "/_Izmeni/U_baci"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1169,7 +1169,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Izgled programa"
 
@@ -1215,7 +1215,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1270,403 +1270,412 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/compose.c:551
+#: src/compose.c:552
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:554
+#: src/compose.c:555
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u direktorijum _nedovršeno"
 
-#: src/compose.c:556
+#: src/compose.c:557
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije i nastavi da pišeš"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Prikači datoteku"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Izmeni/_Undo"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Izmeni/Sažmi trenutni _paragraf"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 
-#: src/compose.c:582
+#: src/compose.c:583
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Pregled/_Za"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Pregled/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Pregled/_Odgovori"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pregled/P_rosledi"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Len_jir"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:694
+#: src/compose.c:695
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:695
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Alati/_Izvrši"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Dodatak"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,26 +1683,26 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1703,12 +1712,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1717,15 +1726,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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,96 +1743,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1833,52 +1842,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2061,7 +2070,7 @@ msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2370,7 +2379,7 @@ msgstr "Osvežavam stablo direktorijuma..."
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4152,21 +4161,21 @@ msgstr "Podešavanje naloga"
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za podešavanje naloga...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -4174,7 +4183,7 @@ msgstr "Privatnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4302,7 +4311,7 @@ msgid "Authentication method"
 msgstr "Način provere identieta"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatski"
 
@@ -4351,8 +4360,8 @@ msgstr "Generiši ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Izmeni... "
 
@@ -4378,7 +4387,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Proveri identitet sa POP3 pre slanja"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Potpis"
@@ -4689,284 +4698,294 @@ msgstr "Obriši akciju"
 msgid "Do you really want to delete this action?"
 msgstr "Želite li zaista obrisati ovu akciju?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Stvaranje prozor za uobičajena podešavanja...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Uobičajena podešavanja"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Auto-provera nove pošte"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "svakih"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Proveri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Osveži sve direktorijume posle prihvatanja"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Naredba"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Prihvati sa spoola"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtriraj pri prihvataju"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Sačuvaj poslate poruke u poslato"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Izlazni charset"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Izlazni charset"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Glavno"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Odvaja potpis"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi nalog za odgovore"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Taster za odgovor povlači odgovor za listu"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Editor"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni spoljašnji editor"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Undo nivo"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Sažmi pri unosu"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normalno"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Format proseđivanja"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Stalni ključ potpisa"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrati news grupe duže od"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "slova"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Postavljanje pojedinosti prikaza... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Poruka"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4975,609 +4994,609 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišćen."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve sa 1-byte znakovima"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz podešavanje zaglavlja"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Odaberite ključeve"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Obriši direktorijum"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Obriši direktorijum"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Automatski proveri potpis"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Smesti lozinku privremeno u memoriju"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Ističe posle"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minut(a)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Postavljanje na '0' će smestiti loyinku\n"
 "u toku cele sesije)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nijedna datoteka poruke nije odabrana."
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Nema više obeleženih poruka"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Samo označi poruke kao pročitane pri otvaranju novog prozora"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Idi u sanduče posle primanja pošte"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Proveri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Prikaz imena"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Uvek"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Zatvori dijalog primanja kada se završi"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u odredište kada se dva put klikne"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Pitaj pre pražnjenja"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Web čitač"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeno sanduče"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Koristi spoljni program za slanje"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Koristi spoljni program za prihvatanje"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Koristi spoljni program za slanje"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Evropski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Evropski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ćirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "skraćeno ime meseca"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vreme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vreme"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vreme"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skraćenica"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći nivo"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Ciklično menjaj boje citata"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5601,11 +5620,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5619,7 +5638,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5631,20 +5650,20 @@ msgstr ""
 "Literal početna zagrada\n"
 "Literal završna zagrada"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Prečice sa tastature"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
diff --git a/po/sv.po b/po/sv.po
index 9f280bdd..335aa771 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Skräppostfilter"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -834,7 +834,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -856,8 +856,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
@@ -922,7 +922,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -936,12 +936,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -959,7 +959,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +989,7 @@ msgstr "/_Redigera/Klistra _in"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -1166,7 +1166,7 @@ msgstr "Fel vid konvertering av adressbok"
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Gränssnitt"
 
@@ -1212,7 +1212,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Notera"
 
@@ -1267,369 +1267,378 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visa/_Teckenkodning/_Automatisk"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Bilagor"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,26 +1646,26 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1676,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1693,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,93 +1710,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1797,48 +1806,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2020,7 +2029,7 @@ msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2324,7 +2333,7 @@ msgstr "Uppdatering av mappträdet misslyckades."
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Skräp"
 
@@ -4082,21 +4091,21 @@ msgstr "Kontoinställningar"
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Skicka"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Integritet"
 
@@ -4104,7 +4113,7 @@ msgstr "Integritet"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Avancerat"
 
@@ -4230,7 +4239,7 @@ msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -4276,8 +4285,8 @@ msgstr "Skapa Meddelande-ID"
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr "Redigera..."
 
@@ -4302,7 +4311,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan brev skickas"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Signatur"
@@ -4614,85 +4623,85 @@ msgstr "Ta bort åtgärd"
 msgid "Do you really want to delete this action?"
 msgstr "Vill du verkligen ta bort denna åtgärd?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Skapar fönster för allmänna inställningar...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Allmänna inställningar"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Visa"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Skräppost"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Hämta ny post automatiskt"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "med"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "minuters mellanrum"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Hämta ny post vid uppstart"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Uppdatera alla lokala mappar efter att ny post hämtats"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Kör kommando när nytt meddelande anländer"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' kommer att ersättas med antalet nya meddelanden."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Inkorporera från spole"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Filtrera vid inkorporering"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Sökväg till spole"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Spara skickade meddelanden i kö-mappen"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Använd filterregler på sända meddelanden"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Kodning för överföring"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4700,194 +4709,204 @@ msgstr ""
 "Ange vilken kodning för överföring meddelandetexten\n"
 "ska ha när det innehåller icke-ASCII-tecken."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Filnamn kodning"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Filnamn kodning"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Allmänt"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Infoga automatiskt"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Svara"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Välj automatiskt konto för svar"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Citera meddelande vid svar"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Svara-knappen ger svar till e-postlista"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Starta automatiskt extern redigerare"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Ångranivå"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Radbryt meddelanden vid"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "tecken"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Radbryt citering"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Radbryt vid indata"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Spara i utkastsmapp"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Svarsformat"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Citationstecken"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Vidarebefordringsformat"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Beskrivning av symboler "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Förvald inkorg"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Text"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Mappvy"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Visa antal olästa bredvid mappnamn"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Visa meddelandeantalkolumner i mappvyn"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Förkorta diskussionsgrupper längre än"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "bokstäver"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Summeringsvy"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Expandera trådar"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Ställ in fält att visa i summeringen... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4895,11 +4914,11 @@ msgstr ""
 "Om \"Automatisk\" är vald, kommer den optimala\n"
 "kodningen för det nuvarande språket att användas."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Aktivera färgläggning av meddelande"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4907,300 +4926,300 @@ msgstr ""
 "Visa multi-byte-alfabet och -siffror som\n"
 "ASCII-tecken (endast Japanska)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudspanel ovanför meddelandevy"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Visa korta brevhuvuden i meddelandevy"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Rendera HTML meddelanden som text"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Rendera HTML meddelanden som text"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Visa markören i meddelandevy"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "bildpunkter"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Halvsida"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Steg"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Ändra storlek på bifogade stora bilder så att de ryms i fönstret"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Visa bilder som inline"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Använd Skräppostkontroll"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Lärande kommando:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Välj nycklar"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Inte Skräp"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Klassificerande kommando"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Skräpmapp"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Meddelanden som är markerade som skräppost flyttas till denna mapp"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrera meddelanden klassificerade som skräp vid mottagning"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Ta bort från server"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Ta bort från server"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Undersök signaturer automatiskt"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Visa resultat av signaturundersökning i ett extrafönster"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Lagra lösenfras temporärt i minnet"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Utgår efter"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Om 0 angivits kommer lösenfrasen att lagras hela sessionen."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Håll fokus under inskrivning av lösenfas"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Visa varning vid start om GnuPG inte fungerar"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Öppna alltid meddelanden i summering, när de valts"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Öppna första olästa meddelande vid öppning av mapp"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Markera endast meddelande som läst, när det öppnats i nytt fönster"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Gå till inkorgen efter att ny post kommit"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Hämta ny post vid uppstart"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Meddelanden kommer endast vara markerade tills exekvering om detta är "
 "avstängt)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Gör ordningen på knapparna enligt GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Visat namn"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr "Ställ in tangentbindningar..."
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Övrigt"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Kör kommando"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Mottagningsdialog"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Alltid"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte feldialog vid hämtningsfel"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Stäng mottagningsdialog efteråt"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Fråga innan tömning"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Förvald webbläsare)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Skicka med externt program"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Använd externt program för hämtning"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Skicka med externt program"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Använd strikt kontroll av integriteten för summeringscache"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5210,279 +5229,279 @@ msgstr ""
 "applikationer.\n"
 "Detta val kommer att försämra kapaciteten för visa summering."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Väntetid för uttags-I/O (socket I/O):"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "sekunder"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Rekommenderad)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitars ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreisk (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Förenklad kinesisk (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "förkortat veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid gällande lokalt"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "århundradetal (årtal/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "datum gällande lokalt"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller förkortning"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Ställ in meddelandefärger"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - Första nivån"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra nivån"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje nivån"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Återanvänd citeringsfärger"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Välj färg för URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5506,11 +5525,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Om x är inställd, visas expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5524,7 +5543,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5536,19 +5555,19 @@ msgstr ""
 "Bokstavlig öppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Välj förvalda tangentbindningar..."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
diff --git a/po/tr.po b/po/tr.po
index b17b0331..29198c45 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "dizin:"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -834,7 +834,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
@@ -856,8 +856,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
@@ -922,7 +922,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -936,12 +936,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -959,7 +959,7 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +989,7 @@ msgstr "/Dü_zenle/_Yapıştır"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -1171,7 +1171,7 @@ msgstr "Adres Defteri Çevrim Hatası"
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Arayüz"
 
@@ -1217,7 +1217,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Not"
 
@@ -1272,394 +1272,403 @@ msgstr "Kahverengi"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizinine kaydet"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Şuanki paragrafı kaydır"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Görünüm/_Yanıtla/"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Görünüm/_Kodlama/"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 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:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 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:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 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:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 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:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Ekler"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1667,25 +1676,25 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1696,12 +1705,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1710,15 +1719,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1727,95 +1736,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1825,52 +1834,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2054,7 +2063,7 @@ msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2360,7 +2369,7 @@ msgstr "Dizin ağacı yeniden oluşturulamadı."
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4125,21 +4134,21 @@ msgstr "Hesap tercihleri"
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Gönder"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Gizlilik"
 
@@ -4147,7 +4156,7 @@ msgstr "Gizlilik"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Gelişmiş"
 
@@ -4274,7 +4283,7 @@ msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -4324,8 +4333,8 @@ msgstr "İleti Numarası Oluştur"
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Düzenle... "
 
@@ -4351,7 +4360,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "İmza"
@@ -4665,88 +4674,88 @@ msgstr "Eylemi sil"
 msgid "Do you really want to delete this action?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Genel tercihler penceresi oluşturuluyor...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Genel Tercihler"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Görünüm"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Yeni postaları otomatik denetle"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "her"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "dakikada"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Açılışta yeni e-postaları denetle"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Dağıtımdan sonra tüm yerel dizinleri güncelle"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Komut"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Spooldan dağıt"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Dağıtım filtresi"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Makara konumu"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Gönderilen iletileri giden kutusuna kaydet"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Transfer kod kümesi"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4755,196 +4764,206 @@ msgstr ""
 "Mesaj gövdesi ASCII karakter içermediği zaman kullanılacak\n"
 "İçerik Transfer Kodlamasını seçiniz."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "Giden ileti kod kümesi"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "Giden ileti kod kümesi"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Genel"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "İmza ayıracı"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Otomatik ekle"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Yanıtlamalarda hesabı otomatik seç"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Yanıtlarken alıntı yap"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Yanıtla tuşu eposta listelerine de yanıtlasın"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Harici düzenleyici otomatik çalıştır"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Geri alma seviyesi"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "İletileri kaydır: "
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Alıntı Kaydırması"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Girdide Kaydır"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Taslak dizinine kaydet"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Yanıtlama formatı"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Alıntı işareti"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Yönlendirme biçimi"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Sembollerin açıklaması "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "Metin"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "Dizin"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "posta"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Özet Görünüm"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Dizileri Genişlet"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Tarih biçimi"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Özetin görüntü nesnesini belirt"
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "İleti"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4953,11 +4972,11 @@ msgstr ""
 "Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
 "kümesi kullanılacaktır."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "İletileri renklendir"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4965,596 +4984,596 @@ msgstr ""
 "Çok bytelı alfabe veya numaraları \n"
 "ASCII karakter olarak göster(Sadece Japonca)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Postaları gösterirken üst kısımda başlıkları göster"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Satır boşluğu"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "benek"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Kaydır"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Yarım sayfa"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Yumuşak kaydır"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Adım"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Pencereye uyması için eklenmiş büyük resimleri yenşden boyutlandır"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Görüntü başlığı ayarları"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Anahtarları Seçin"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Sunucudan sil"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Sunucudan sil"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "İmzaları otomatik denetle"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "İmza kontrol sonuçlarını ek pencerede göster"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Parolayı geçici olarak hafızada sakla"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Belirtilen süre sonra geçerliliğini yitir"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr " dakikada"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Bu değere '0' atayarak parolanın\n"
 "tüm oturuum süresince saklanmasını sağlayabilirsiniz.)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Parolayı girerken girdiyi yakala"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Posta sadece yeni pencerede okunduğunda okunmuş olarak işaretle"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "İleti geldiğinde gelen kutusuna git"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Açılışta yeni e-postaları denetle"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Eğer bu özellik kapalı ise işlem bitinceye kadar\n"
 "postalar işaretlenecektir.)"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Görüntülenecek İsim"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Diğer"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Alma penceresi"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Alma penceresini göster"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Her zaman"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Alma sırasında bir hata oluşursa ek pencerede gösterme"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "İşlemler tamamlandığında alma penceresini kapat"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Çift tıklandığında adresi hedefe ekle"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Çıkışta"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Çıkışta sor"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Çıkışta çöpü boşalt"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Boşaltmadan önce sor"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Kuyrukta ileti varsa uyar"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Tarayıcı"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Göndermek için harici program kullan"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Dağıtım için harici program kullan"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Göndermek için harici program kullan"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Soket I/O zaman aşımı:"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Otomatik (Önerilen)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Batı Avrupa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Orta Avrupa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkçe (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kiril (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kiril (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kiril (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonca (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Japonca (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel Çince (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel Çince (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Çince (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "kısa hafta adı"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "kısa ay adı"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "sayı değerinde ayın günü"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "yılın gününün sayı değeri"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "ay sayı değerinde"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "haftanın günü"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "yılın son iki rakamı"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "yıl"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya adı"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Tanım"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen alıntı metin"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "İkinci dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Üçüncü dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URL bağlantısı"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Alıntı renklerini dönüştür"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "İkinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Üçüncü dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "URL için renk seçiniz"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "sembollerin açıklamaları"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5577,11 +5596,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Eğer x belirtilmişse expr göster"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5595,7 +5614,7 @@ msgstr ""
 "İmzasız alıntı yapılan metin\n"
 "Tam %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5607,20 +5626,20 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Tuş bağıntıları"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
diff --git a/po/uk.po b/po/uk.po
index 76480dea..a79d9999 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 msgid "Junk mail filter (manual)"
 msgstr "Фільтр мотлоху (вручну)"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -837,7 +837,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
@@ -858,8 +858,8 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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 "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
 #: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
-#: src/compose.c:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
@@ -924,7 +924,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -937,12 +937,12 @@ msgstr "/Інструменти/Імпортувати файл LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -960,7 +960,7 @@ msgid "/New _Folder"
 msgstr "/Нова папка"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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,7 +988,7 @@ msgstr "/Вставити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1157,7 +1157,7 @@ msgstr "Помилка при конвертуванні адресної кни
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Інтерфейс"
 
@@ -1203,7 +1203,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1258,360 +1258,369 @@ msgstr "Коричневий"
 msgid "None"
 msgstr "Ніякий"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/Файл/Послати"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/Файл/Послати пізніше"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти в папці чернеток"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Приєднати підпис"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Undo"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Згорнути поточний абзац"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Згорнути всі довгі рядки"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:587
+#: src/compose.c:588
 msgid "/_View/_Reply-To"
 msgstr "/Вигляд/Зворотня адреса"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 msgid "/_View/_Followup-To"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:595
+#: src/compose.c:596
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вигляд/Налаштувати панель інструментів"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодова таблиця/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (Windows-1257)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (ISO-8859-_6)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (_Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/Інструменти/Перевірка правопису"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Вкладення"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,25 +1628,25 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1648,11 +1657,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1665,15 +1674,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 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 "
@@ -1687,93 +1696,93 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалось відкрити файл %s."
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1782,48 +1791,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2003,7 +2012,7 @@ msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2304,7 +2313,7 @@ msgstr "Не вдалось перебудувати дерево папок."
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Мотлох"
 
@@ -4056,21 +4065,21 @@ msgstr "Налаштування запису"
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Послати"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4078,7 +4087,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Advanced"
 
@@ -4202,7 +4211,7 @@ msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -4246,8 +4255,8 @@ msgstr "Генерувати Message-ID"
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Редагувати... "
 
@@ -4272,7 +4281,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Аутентифікація POP3 перед відсиланням"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Підпис"
@@ -4580,85 +4589,85 @@ msgstr "Видалити дію"
 msgid "Do you really want to delete this action?"
 msgstr "Ви дійсно бажаєте видалити цю дію?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Створюємо вікно загальних опцій...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Загальні налаштування"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Відображення"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Мотлох"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Подробиці"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "кожні"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "хвилин"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Перевіряти нову пошту при запуску"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Оновлювати всі локальні папки після прийому"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Виконувати команду після прибуття нових листів"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' буде замінено на кількість нових листів."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Отримувати з локального спулу"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Фільтрувати при прийомі"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Шлях до спулу"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Зберігати відіслані листи в outbox"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Застосувати правила фільтрування до відісланих листів"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Кодування пересилки"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4666,15 +4675,15 @@ msgstr ""
 "Вкажіть Content-Transfer-Encoding для вживання, якщо тіло листа містить не-"
 "ASCII символи."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Кодування MIME для імен файлів"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr "Заголовок MIME"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
@@ -4684,171 +4693,181 @@ msgstr ""
 "Заголовок MIME: найпопулярніший, але порушує RFC 2047\n"
 "RFC 2231: відповідає стандарту, але непопулярний"
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Загальні"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Розділювач підпису"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Вставити автоматично"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Автоматично вибирати запис для відповідей"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Цитувати лист при відповіді"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Кнопка відповіді запускає відповідь конференції"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr "Успадковувати отримувачів при відповідях собі"
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Автоматично запускати зовнішній редактор"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Рівень Undo"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Згортати рядки листів після"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "символів"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Згортати цитування"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Згорнути при вводі"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Автоматично зберігати в папці чернеток"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Формат"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Перевірка правопису"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Формат відповіді"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Знак цитати"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Формат пересилання"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Опис символів "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Ввімкнути перевірку правопису"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Мова за замовчуванням"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Шрифт тексту"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Відображення папок"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Показувати кількість непрочитаного після назви папки"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Показувати колонки номера листа при відображенні папок"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скорочувати назви конференцій, довші ніж"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "літер"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Список повідомлень"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Розгортати обговорення"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Формат дати"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Показувати наступні поля... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Кодова таблиця за замовчуванням"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Вживається для показу листів без вказаного кодування."
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Кодова таблиця для вихідної пошти"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4856,11 +4875,11 @@ msgstr ""
 "Якщо включено `Автоматична', буде обрано оптимальне кодування для діючої "
 "locale."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Дозволити розфарбування листів"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4868,84 +4887,84 @@ msgstr ""
 "Відображати 2-байтний алфавіт і числа\n"
 "однобайтним символом (для японської мови)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Показувати панель заголовка над листом"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Показувати скорочені заголовки при перегляді листів"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Зображати HTML-листи як текст"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Зображати HTML-листи як текст"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Показувати курсор при відображенні папок"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Міжрядковий інтервал"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "пікселів"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Півсторінки"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Плавна прокрутка"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Зображення"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабувати приєднані картинки відповідно до вікна"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Відображати зображення в тілі листа"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Ввімкнути контроль мотлоху"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Вивчення команди:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Обрати стандартне налаштування)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Не мотлох"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Класифікувати команду"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4953,205 +4972,205 @@ msgstr ""
 "Щоб автоматично класифікувати мотлох, доведеться навчати програму відрізняти "
 "його від нормальних листів. "
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Папка мотлоху"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Листи, позначені як мотлох, складаємо у цій папці."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Фільтрувати листи, класифіковані як мотлох, при отриманні"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 msgid "Filter junk mails before normal filtering"
 msgstr "Фільтрувати мотлох перед нормальним фільтруванням"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Видаляти мотлох з сервера після отримання"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Позначити відфільтрований мотлох як прочитане"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Автоматично перевіряти підписи"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Показувати результат перевірки підпису у спливаючому вікні"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Тимчасово зберігати пароль в пам'яті"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Недійсний після"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "хвилин "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Присвоєння '0' зберігає пароль протягом всієї сесії."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Захопити ввід при введенні паролю"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Попереджати при запуску, якщо GnuPG не працює"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Завжди відкривати листи у списку при виділенні"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 msgid "Open first unread message when a folder is opened"
 msgstr "Відкривати перший непрочитаний лист, входячи в папку"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 msgid "Remember last selected message"
 msgstr "Запам'ятати останній обраний лист"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 msgid "Open inbox after receiving new mail"
 msgstr "Відкривати папку `Вхідні', отримавши нову пошту"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 msgid "Open inbox on startup"
 msgstr "Відкривати папку `Вхідні' при запуску"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Виконувати негайно після видалення чи переміщення листів"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Листи буде позначено до виконання, якщо це вимкнути."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Узгоджувати порядок кнопок з GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Показати іконку панелі"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr "Мінімізувати до іконки трею"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr "Перемикати вікно при клацанні на іконці трею"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Встановити гарячі клавіші... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Інше"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Зовнішні команди"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Діалог отримання"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Показувати діалог отримання"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Завжди"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Тільки при ручному отриманні"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Ніколи"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Не видавати діалог при помилці отримання"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Закрити діалог отримання після завершення"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Додати адресу до призначення, коли клацнути двічі"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "При виході"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Підтвердити при виході"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "При виході очищати кошик"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Питати перед очищенням"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Попереджати, якщо є листи в черзі"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Браузер за замовчуванням)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 msgid "Use external program for printing"
 msgstr "Вживати зовнішню програму для друку"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Вживати зовнішню програму для прийому"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Вживати зовнішню програму для відсилання"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Ввімкнути строгу перевірку цілісності кешів"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5160,275 +5179,275 @@ msgstr ""
 "Ввімкнути, якщо вміст папок може змінюватись іншими програмами.\n"
 "Ця опція погіршить відображення списка повідомлень."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета вводу/виводу"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Автоматична (рекомендовано)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Західноєвропейська (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Західноєвропейська (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Західноєвропейська (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Цнтральноєвропейська (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтійська (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтійська (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 msgid "Baltic (Windows-1257)"
 msgstr "Балтійська (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Грецька (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арабська (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "Арабська (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Єврейська (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Єврейська (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецька (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилиця (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилиця (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилиця (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилиця (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японська (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Японська (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Японська (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрощена китайська (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Спрощена китайська (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиційна китайська (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиційна китайська (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайська (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Тайська (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Тайська (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "повна скорочена назва дня тижня"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "повна назва дня тижня"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "скорочена назва місяця"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "повна назва місяця"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "бажана дата і час для поточної locale"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "номер сторіччя (рік/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "день місяця як десяткове число"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "година як десяткове число за 24-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "година як десяткове число за 12-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "день року як десяткове число"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "місяць як десяткове число"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "хвилини як десяткове число"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM чи PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "секунди як десяткове число"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "день тижня як десяткове число"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "бажана дата для поточної locale"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "останні дві цифри року"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "рік як десяткове число"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "часова зона або ім'я або скорочення"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Специфікатор"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Опис"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Приклад"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Встановити кольори листа"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Цитований текст - перший рівень"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Цитований текст - другий рівень"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Цитований текст - третій рівень"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Повторно використати кольори цитування"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Обрати колір для цитування рівня 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Обрати колір для цитування рівня 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Обрати колір для цитування рівня 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Обрати колір для URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Опис символів"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5452,11 +5471,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "якщо встановлено x, показує expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5470,7 +5489,7 @@ msgstr ""
 "Тіло цитованого повідомлення без підпису\n"
 "Буквально %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5482,19 +5501,19 @@ msgstr ""
 "Буквальна відкриваюча фігурна дужка\n"
 "Буквальна закриваюча фігурна дужка"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Гарячі клавіші"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr " Обрати попередньо означені гарячі клавіші."
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "За замовчуванням"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Старий Sylpheed"
 
diff --git a/po/vi.po b/po/vi.po
index c5953177..f2b44037 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Lọc thư rác"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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 "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
@@ -837,8 +837,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -857,21 +857,21 @@ msgstr "/_Tập tin/_Xoá"
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
@@ -903,7 +903,7 @@ msgstr "/Đị_a chỉ/_Soạn"
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
@@ -917,12 +917,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:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
@@ -940,7 +940,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:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -970,7 +970,7 @@ msgstr "/_Soạn/_Dán"
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
@@ -1149,7 +1149,7 @@ msgstr "Lỗi chuyển đổi sổ địa chỉ"
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "Giao diện"
 
@@ -1195,7 +1195,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1250,364 +1250,373 @@ msgstr "Nâu"
 msgid "None"
 msgstr "Không"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/Thê_m..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/_Tập tin/_Gửi"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/_Tập tin/Gửi _sau"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/_Tập tin/Lưu vào thư mục _nháp"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/_Tập tin/Lưu và _tiếp tục soạn"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/_Tập tin/Đính _kèm tập tin"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/_Tập tin/_Chèn tập tin"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/_Tập tin/Chèn _chữ kí"
 
-#: src/compose.c:563
+#: src/compose.c:564
 msgid "/_File/A_ppend signature"
 msgstr "/_Tập tin/Thêm _chữ kí"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/_Soạn/_Hoàn tác"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/_Soạn/Ch_uyển tác"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Soạn/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/_Soạn/_Cắt"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Soạn/Chọ_n tất cả"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Soạn/_Khuôn dòng đoạn hiện tại"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Soạn/Khuôn _mọi dòng dài"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/_Xem"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/_Xem/_Người nhận"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/_Xem/_Cc"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/_Xem/_Bcc"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Xem/_Hồi âm cho"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Xem/Tiế_p sau"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/_Xem/_Thước kẻ"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/_Xem/Đí_nh kèm"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Xem/Mã _kí tự/_Tự động"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 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:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 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:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 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:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 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:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 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:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 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:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 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:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 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:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 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:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 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:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 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:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 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:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 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:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 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:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Công cụ/Soạ_n với chương trình ngoài"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Công cụ/Chữ _kí PGP"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Công cụ/Mã hoá _PGP"
 
-#: src/compose.c:700
+#: src/compose.c:701
 msgid "/_Tools/_Check spell"
 msgstr "/_Công cụ/Kiểm tra _chính tả"
 
-#: src/compose.c:701
+#: src/compose.c:702
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 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:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "Đính kèm"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1615,25 +1624,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:2938 src/send_message.c:315
+#: src/compose.c:2992 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:2988
+#: src/compose.c:3042
 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:3026
+#: src/compose.c:3080
 #, 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:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1644,11 +1653,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1661,15 +1670,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1678,93 +1687,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 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:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, 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:5975
+#: src/compose.c:6029
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1773,48 +1782,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:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 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:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, 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:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -1996,7 +2005,7 @@ msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2299,7 +2308,7 @@ msgstr "Việc làm lại cây thư mục thất bại."
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "Rác"
 
@@ -4071,21 +4080,21 @@ msgstr "Cấu hình tài khoản"
 msgid "Creating account preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "Nhận"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "Gửi"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "Viết thư"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "Riêng tư"
 
@@ -4093,7 +4102,7 @@ msgstr "Riêng tư"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "Nâng cao"
 
@@ -4218,7 +4227,7 @@ msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "Tự động"
 
@@ -4263,8 +4272,8 @@ msgstr "Tạo ID của thư"
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " Soạn... "
 
@@ -4289,7 +4298,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "Xác thực với POP3 trước khi gửi"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "Chữ kí"
@@ -4598,85 +4607,85 @@ msgstr "Xoá hành động"
 msgid "Do you really want to delete this action?"
 msgstr "Bạn có thực sự muốn xoá hành động này?"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình chung...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "Cấu hình chung"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "Hiển thị"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "Thư rác"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr "Chi tiết"
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "Tự động kiểm tra thư mới"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "mỗi"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "phút"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "Kiểm tra thư mới khi chạy chương trình"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "Cập nhập mọi thư mục cục bộ sau khi sáp nhập"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "Chạy lệnh khi có thư mới"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "Lệnh"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' sẽ được thay thế tương ứng với số thư mới."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "Sáp nhập từ spool cục bộ"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "Lọc khi sáp nhập"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Đường dẫn spool"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "Lưu thư đã gửi vào hộp Đã gửi"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "Áp dụng quy tắc lọc cho thư đã gửi"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "Mã kí tự khi chuyển"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4684,186 +4693,196 @@ msgstr ""
 "Chỉ định Mã-kí-tự-khi-chuyển-nội-dung sẽ được dùng khi nội dung thư chứa các "
 "kí tự không phải ASCII."
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 msgid "MIME filename encoding"
 msgstr "Mã MIME của tên tập tin"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 msgid "MIME header"
 msgstr ""
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Chung"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "Vạch phân cách chữ kí"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "Chèn tự động"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "Hồi âm"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "Tự động chọn tài khoản để hồi âm"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "Trích dẫn thư khi hồi âm"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "Nhấn nút Hồi âm để hồi âm cho hộp thư chung"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "Tự động chạy trình soạn thảo ngoài"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "Mức hoàn tác"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "Khuôn dòng thư tại"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "kí tự"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "Khuôn dòng phần trích dẫn"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "Khuôn dòng khi nhập"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 msgid "Auto-save to draft"
 msgstr "Tự động lưu vào thư mục nháp"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 msgid "Format"
 msgstr "Định dạng"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr "Kiểm tra chính tả"
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "Định dạng hồi âm"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "Dấu trích dẫn"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "Định dạng chuyển tiếp"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " Giải thích các kí hiệu "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr "Cho phép kiểm tra chính tả"
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 msgid "Default language:"
 msgstr "Ngôn ngữ mặc định:"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 msgid "Text font"
 msgstr "Phông chữ cho văn bản"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "Khung Thư mục"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "Hiển thị số thư chưa đọc ngay sau tên thư mục"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "Hiển thị cột số thư chưa đọc trên khung thư mục"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "Viết tắt khi tên nhóm tin dài hơn"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "chữ cái"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "Khung xem tóm tắt"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Hiện người nhận trên cột `Người gửi' nếu người gửi là bạn"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "Mở rộng các luồng thư"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "Định dạng thời gian"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " Đặt các mục hiển thị trên bảng tóm tắt... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "Thư"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 msgid "Default character encoding"
 msgstr "Mã kí tự mặc định"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Phần này được dùng khi hiển thị thư bị mất thông tin về mã kí tự"
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 msgid "Outgoing character encoding"
 msgstr "Mã kí tự đầu ra"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4871,11 +4890,11 @@ msgstr ""
 "Nếu chọn `Tự động', mã kí tự tối ưu cho thiết lập bản địa hiện tại sẽ được "
 "dùng."
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "Cho phép màu sắc trong thư"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4883,84 +4902,84 @@ msgstr ""
 "Hiển thị bảng chữ cái và chữ số đa byte\n"
 "ở dạng kí tự ASCII (chỉ tiếng Nhật)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "Hiện ô header phía trên khung xem thư"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "Hiện header dạng ngắn gọn trên khung xem thư"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "Hiển thị HTML ở dạng văn bản thuần tuý"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Hiển thị HTML ở dạng văn bản thuần tuý"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "Hiển thị con trỏ trong khung xem thư"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "Khoản cách dòng"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "Cuộn"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "Nửa trang"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "Cuộn trơn"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "Bước"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "Hình ảnh"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "Đổi kích thước ảnh to cho vừa với cửa sổ"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "Hiện hình ảnh ngay trên dòng"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "Cho phép điều khiển thư rác"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "Lệnh thu thập:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 msgid "(Select preset)"
 msgstr "(Chọn kiểu)"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "Không phải thư rác"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "Lệnh phân loại"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4968,212 +4987,212 @@ msgstr ""
 "Để tự động phân loại thư rác, chương trình phải được học phân biệt thư rác "
 "và thư bình thường ở một mức nhất định."
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "Thư mục thư rác"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Các thư bị đánh dấu là thư rác sẽ được chuyển tới thư mục này."
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "Lọc thư được phân loại là thư rác lúc nhận"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Xoá thư rác khỏi máy chủ khi nhận"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 msgid "Delete junk mails from server on receiving"
 msgstr "Xoá thư rác khỏi máy chủ khi nhận"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr "Đánh dấu là đã đọc các thư rác đã lọc"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "Tự động kiểm tra chữ kí"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "Hiện kết quả kiểm tra chữ kí trong cửa sổ popup"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "Lưu tạm mật khẩu vào bộ nhớ"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "Hết hạn sau"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "phút "
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Đặt là '0' để lưu mật khẩu trong suốt phiên làm việc."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "Bắt (grab) đầu vào khi nhập mật khẩu"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Hiển thị cảnh báo lúc khởi động nếu GnuPG không hoạt động"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "Luôn mở thư trong phần tóm tắt khi được chọn"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Mở thư chưa đọc đầu tiên khi vào một thư mục"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "Chỉ đánh dấu thư là đã đọc khi mở trong cửa sổ mới"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Đi đến hộp nhận sau khi nhận thư mới"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Kiểm tra thư mới khi chạy chương trình"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Thực thi ngay lập tức khi di chuyển hoặc xoá thư"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Thư sẽ được đánh dấu đến khi thực thi nếu không dùng tuỳ chọn này."
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Sắp xếp thứ tự các nút tương ứng với GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 msgid "Display tray icon"
 msgstr "Hiển thị biểu tượng trên khay"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " Đặt phím tắt... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "Khác"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 msgid "External commands"
 msgstr "Lệnh ngoài"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "Hộp thoại nhận thư"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "Hiện hộp thoại nhận thư"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "Luôn luôn"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "Chỉ khi nhận theo kiểu thủ công"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "Không hiện hộp thoại báo lỗi kiểu popup khi gặp lỗi"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "Đóng hộp thoại nhận thư khi hoàn thành"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "Thêm địa chỉ vào đích đến khi nhấn đúp"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "Lúc thoát"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "Xác nhận khi thoát"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "Đổ rác khi thoát"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "Hỏi trước khi đổ rác"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "Cảnh báo nếu có thư chờ được gửi"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Lệnh ngoài (%s sẽ được thay thế bằng tên tập tin / URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "Trình duyệt"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(Trình duyệt mặc định)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Dùng chương trình ngoài để gửi"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "Dùng chương trình ngoài để sáp nhập"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "Dùng chương trình ngoài để gửi"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr ""
 "Cho phép kiểm tra nghiêm ngặt về tính toàn vẹn của bộ đệm của bảng tóm tắt"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5183,276 +5202,276 @@ msgstr ""
 "đổi.\n"
 "Tuỳ chọn này sẽ suy giảm hiệu năng của việc hiển thị bảng tóm tắt."
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "Hết hạn I/O socket"
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "giây"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "Tự động (Khuyến cáo)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "Đông Âu (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "Tây Âu (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 msgid "Western European (Windows-1252)"
 msgstr "Tây Âu (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "Trung Âu (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "A-rập (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "Hi Lạp (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 msgid "Arabic (ISO-8859-6)"
 msgstr "A-rập (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 msgid "Arabic (Windows-1256)"
 msgstr "A-rập (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Do Thái (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "Do Thái (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "Thổ Nhĩ Kì(ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Nhật Bản (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "Nhật Bản (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "Nhật Bản (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "Hán giản thể (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "Hán giản thể (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "Hán phồn thể (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Hán phồn thể (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hán (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "Triều Tiên (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "Thái (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "Thái (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "dạng viết tắt của ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "dạng đầy đủ tên ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "dạng viết tắt của tên tháng"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "dạng đầy đủ của tên tháng"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "định dạng thời gian cho locale hiện tại"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "thế kỉ (năm/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "ngày trong tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 24 giờ"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 12 giờ"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "ngày trong năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "phút ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "hoặc là AM hoặc là PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "giây ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "ngày trong tuần ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "định dạng ưu tiên cho ngày tháng của locale hiện tại"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "hai số cuối của năm"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "múi giờ hoặc tên hoặc dạng viết tắt"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "Kí hiệu"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "Miêu tả"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "Ví dụ"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "Đặt màu cho thư"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "Màu sắc"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "Nội dung trích dẫn - Cấp 1"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "Nội dung trích dẫn - Cấp 2"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "Nội dung trích dẫn - Cấp 3"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "Liên kết URI"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "Lặp lại theo vòng"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "Chọn màu cho phần trích dẫn cấp 1"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "Chọn màu cho phần trích dẫn cấp 2"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "Chọn màu cho phần trích dẫn cấp 3"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "Chọn màu cho URI"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "Miêu tả về biểu tượng"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5476,11 +5495,11 @@ msgstr ""
 "Nhóm tin\n"
 "ID của thư"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "Nếu x đã được đặt, hiển thị expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5494,7 +5513,7 @@ msgstr ""
 "Nội dung thư được trích dẫn không gồm chữ kí\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5506,19 +5525,19 @@ msgstr ""
 "Dấu ngoặc nhọn mở\n"
 "Dấu ngoặc nhọn đóng"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "Phím tắt"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "Chọn kiểu phím tắt. "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "Mặc định"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "Sylpheed cũ"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 905b1b7a..b8058bc5 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "文件夹："
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 #, 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -828,7 +828,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -850,8 +850,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -870,21 +870,21 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
@@ -916,7 +916,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -930,12 +930,12 @@ msgstr "/工具(_T)/导入LDIF文件(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -953,7 +953,7 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -983,7 +983,7 @@ msgstr "/编辑(_E)/粘贴(_P)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1157,7 +1157,7 @@ msgstr "地址簿转换错误"
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "界面"
 
@@ -1203,7 +1203,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1258,373 +1258,382 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "附件"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1632,25 +1641,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1660,12 +1669,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1683,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1691,95 +1700,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1789,51 +1798,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2016,7 +2025,7 @@ msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr " ... "
 
@@ -2322,7 +2331,7 @@ msgstr "重建文件夹树失败。"
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr ""
 
@@ -4075,21 +4084,21 @@ msgstr "帐号首选项"
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "发送"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "撰写"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4097,7 +4106,7 @@ msgstr "隐私"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "高级"
 
@@ -4224,7 +4233,7 @@ msgid "Authentication method"
 msgstr "验证方法"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "自动"
 
@@ -4274,8 +4283,8 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4298,7 +4307,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "发送前用POP3验证"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "签名"
@@ -4610,293 +4619,303 @@ msgstr "删除动作"
 msgid "Do you really want to delete this action?"
 msgstr "您真的要删除该动作吗？"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "正在创建通用首选项窗口...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "通用首选项"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 #, fuzzy
 msgid "Junk mail"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "自动检查新邮件"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "合并邮件后更新所有的本地文件夹"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "从邮件池合并邮件"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "合并邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "邮件池路径"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "传输编码"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "发送时使用的字符编码"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "常规"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "回复"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "回复按钮会回复到邮件列表"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "输入时折行"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "保存到草稿文件夹"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "普通"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "引文符号"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "文本"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 #, fuzzy
 msgid "Folder View"
 msgstr "文件夹"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4904,589 +4923,589 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "选择密钥"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 #, fuzzy
 msgid "Classifying command"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "显示姓名"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "(Default browser)"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5510,11 +5529,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5528,7 +5547,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5540,20 +5559,20 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8046b487..2067cd13 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-03-27 18:02+0900\n"
+"POT-Creation-Date: 2008-03-28 16:05+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:565
+#: libsylph/prefs_common.c:567
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "垃圾郵件資料夾"
 
-#: libsylph/prefs_common.c:568
+#: libsylph/prefs_common.c:570
 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:4700 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4754 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
@@ -831,7 +831,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:351 src/compose.c:548 src/mainwindow.c:525
+#: src/addressbook.c:351 src/compose.c:549 src/mainwindow.c:525
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -853,8 +853,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:553
-#: src/compose.c:558 src/compose.c:561 src/compose.c:564 src/mainwindow.c:543
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:554
+#: src/compose.c:559 src/compose.c:562 src/compose.c:565 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
@@ -873,21 +873,21 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:565 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:566 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:567 src/mainwindow.c:561 src/messageview.c:159
+#: src/compose.c:568 src/mainwindow.c:561 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:368 src/compose.c:572 src/mainwindow.c:562
+#: src/addressbook.c:368 src/compose.c:573 src/mainwindow.c:562
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:369 src/compose.c:573
+#: src/addressbook.c:369 src/compose.c:574
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
@@ -919,7 +919,7 @@ msgstr "/地址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:683 src/mainwindow.c:806
+#: src/addressbook.c:379 src/compose.c:684 src/mainwindow.c:806
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -933,12 +933,12 @@ msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:383 src/compose.c:704 src/mainwindow.c:860
+#: src/addressbook.c:383 src/compose.c:705 src/mainwindow.c:860
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:384 src/compose.c:705 src/mainwindow.c:872
+#: src/addressbook.c:384 src/compose.c:706 src/mainwindow.c:872
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -956,7 +956,7 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
-#: src/compose.c:542 src/folderview.c:251 src/folderview.c:253
+#: src/compose.c:543 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
@@ -986,7 +986,7 @@ msgstr "/編輯(_E)/貼上(_P)"
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2286 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2317 src/prefs_toolbar.c:87
 msgid "Address book"
 msgstr "通訊錄"
 
@@ -1162,7 +1162,7 @@ msgstr "轉換通訊錄格式時發生錯誤"
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2115
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2146
 msgid "Interface"
 msgstr "介面"
 
@@ -1208,7 +1208,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5978 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6032 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1263,369 +1263,378 @@ msgstr "棕色"
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:540
+#: src/compose.c:541
 msgid "/_Add..."
 msgstr "/新增(_A)..."
 
-#: src/compose.c:541
+#: src/compose.c:542
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:543 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:544 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/內容(_P)..."
 
-#: src/compose.c:549
+#: src/compose.c:550
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:551
+#: src/compose.c:552
 msgid "/_File/Send _later"
 msgstr "/檔案(_F)/稍後傳送(_L)"
 
-#: src/compose.c:554
+#: src/compose.c:555
 msgid "/_File/Save to _draft folder"
 msgstr "/檔案(_F)/儲存至草稿資料夾(_D)"
 
-#: src/compose.c:556
+#: src/compose.c:557
 msgid "/_File/Save and _keep editing"
 msgstr "/檔案(_F)/儲存並繼續編輯(_K)"
 
-#: src/compose.c:559
+#: src/compose.c:560
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:560
+#: src/compose.c:561
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:562
+#: src/compose.c:563
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽章(_G)"
 
-#: src/compose.c:563
+#: src/compose.c:564
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/檔案(_F)/插入簽章(_G)"
 
-#: src/compose.c:568
+#: src/compose.c:569
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:569
+#: src/compose.c:570
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:570 src/compose.c:577 src/mainwindow.c:565
+#: src/compose.c:571 src/compose.c:578 src/mainwindow.c:565
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:571
+#: src/compose.c:572
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_T)"
 
-#: src/compose.c:574
+#: src/compose.c:575
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
 
-#: src/compose.c:576 src/mainwindow.c:563 src/messageview.c:161
+#: src/compose.c:577 src/mainwindow.c:563 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_A)"
 
-#: src/compose.c:578
+#: src/compose.c:579
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折列(_W)"
 
-#: src/compose.c:580
+#: src/compose.c:581
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的列折換(_L)"
 
-#: src/compose.c:582
+#: src/compose.c:583
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
-#: src/compose.c:583 src/mainwindow.c:570 src/messageview.c:166
+#: src/compose.c:584 src/mainwindow.c:570 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/顯示(_V)"
 
-#: src/compose.c:584
+#: src/compose.c:585
 msgid "/_View/_To"
 msgstr "/顯示(_V)/收件人(_T)"
 
-#: src/compose.c:585
+#: src/compose.c:586
 msgid "/_View/_Cc"
 msgstr "/顯示(_V)/副本(_C)"
 
-#: src/compose.c:586
+#: src/compose.c:587
 msgid "/_View/_Bcc"
 msgstr "/顯示(_V)/密件副本(_S)"
 
-#: src/compose.c:587
+#: src/compose.c:588
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/顯示(_V)/回覆(_R)"
 
-#: src/compose.c:588 src/compose.c:590 src/compose.c:592 src/compose.c:594
-#: src/compose.c:597 src/mainwindow.c:593 src/mainwindow.c:599
+#: src/compose.c:589 src/compose.c:591 src/compose.c:593 src/compose.c:595
+#: src/compose.c:598 src/mainwindow.c:593 src/mainwindow.c:599
 #: src/mainwindow.c:626 src/mainwindow.c:650 src/mainwindow.c:753
 #: src/mainwindow.c:757 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
-#: src/compose.c:589
+#: src/compose.c:590
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/顯示(_V)/回應文章(_F)"
 
-#: src/compose.c:591
+#: src/compose.c:592
 msgid "/_View/R_uler"
 msgstr "/顯示(_V)/尺規(_U)"
 
-#: src/compose.c:593
+#: src/compose.c:594
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:595
+#: src/compose.c:596
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/compose.c:603 src/mainwindow.c:657 src/messageview.c:173
+#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 
-#: src/compose.c:606 src/compose.c:612 src/compose.c:618 src/compose.c:622
-#: src/compose.c:630 src/compose.c:634 src/compose.c:640 src/compose.c:646
-#: src/compose.c:650 src/compose.c:660 src/compose.c:664 src/compose.c:672
-#: src/compose.c:676 src/mainwindow.c:653 src/mainwindow.c:660
+#: src/compose.c:607 src/compose.c:613 src/compose.c:619 src/compose.c:623
+#: src/compose.c:631 src/compose.c:635 src/compose.c:641 src/compose.c:647
+#: src/compose.c:651 src/compose.c:661 src/compose.c:665 src/compose.c:673
+#: src/compose.c:677 src/mainwindow.c:653 src/mainwindow.c:660
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:608 src/mainwindow.c:661 src/messageview.c:177
+#: src/compose.c:609 src/mainwindow.c:661 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:180
+#: src/compose.c:611 src/mainwindow.c:663 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字元編碼(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:183
+#: src/compose.c:615 src/mainwindow.c:667 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:185
+#: src/compose.c:617 src/mainwindow.c:669 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:620 src/mainwindow.c:675 src/messageview.c:190
+#: src/compose.c:621 src/mainwindow.c:675 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:624 src/mainwindow.c:679 src/messageview.c:193
+#: src/compose.c:625 src/mainwindow.c:679 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:626 src/mainwindow.c:681 src/messageview.c:195
+#: src/compose.c:627 src/mainwindow.c:681 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:683 src/messageview.c:197
+#: src/compose.c:629 src/mainwindow.c:683 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:687 src/messageview.c:200
+#: src/compose.c:633 src/mainwindow.c:687 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:203
+#: src/compose.c:637 src/mainwindow.c:691 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:638 src/mainwindow.c:693 src/messageview.c:205
+#: src/compose.c:639 src/mainwindow.c:693 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:208
+#: src/compose.c:643 src/mainwindow.c:697 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:210
+#: src/compose.c:645 src/mainwindow.c:699 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:213
+#: src/compose.c:649 src/mainwindow.c:703 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:216
+#: src/compose.c:653 src/mainwindow.c:707 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:218
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:656 src/mainwindow.c:711 src/messageview.c:220
+#: src/compose.c:657 src/mainwindow.c:711 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:222
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:717 src/messageview.c:225
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:666 src/mainwindow.c:727 src/messageview.c:234
+#: src/compose.c:667 src/mainwindow.c:727 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GB2312)"
 
-#: src/compose.c:668 src/mainwindow.c:729 src/messageview.c:236
+#: src/compose.c:669 src/mainwindow.c:729 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GBK)"
 
-#: src/compose.c:670 src/mainwindow.c:731 src/messageview.c:238
+#: src/compose.c:671 src/mainwindow.c:731 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (_Big5)"
 
-#: src/compose.c:674 src/mainwindow.c:739 src/messageview.c:245
+#: src/compose.c:675 src/mainwindow.c:739 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (EUC-_KR)"
 
-#: src/compose.c:678 src/mainwindow.c:745 src/messageview.c:250
+#: src/compose.c:679 src/mainwindow.c:745 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 
-#: src/compose.c:680 src/mainwindow.c:747 src/messageview.c:252
+#: src/compose.c:681 src/mainwindow.c:747 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:684 src/mainwindow.c:807 src/messageview.c:283
+#: src/compose.c:685 src/mainwindow.c:807 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
-#: src/compose.c:685
+#: src/compose.c:686
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:687 src/mainwindow.c:831 src/messageview.c:299
+#: src/compose.c:688 src/mainwindow.c:831 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:689 src/compose.c:693 src/compose.c:699 src/mainwindow.c:810
+#: src/compose.c:690 src/compose.c:694 src/compose.c:700 src/mainwindow.c:810
 #: src/mainwindow.c:824 src/mainwindow.c:829 src/mainwindow.c:832
 #: src/mainwindow.c:836 src/mainwindow.c:838 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_X)"
 
-#: src/compose.c:694
+#: src/compose.c:695
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_G)"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:700
+#: src/compose.c:701
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/執行(_X)"
 
-#: src/compose.c:701
+#: src/compose.c:702
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:965
+#: src/compose.c:966
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1069 src/compose.c:1143
+#: src/compose.c:1070 src/compose.c:1144
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1623
+#: src/compose.c:1624
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1635
+#: src/compose.c:1636
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2123
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2127
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2131 src/compose.c:3794
+#: src/compose.c:2132 src/compose.c:3848
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2135
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2168
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2228 src/mimeview.c:583
+#: src/compose.c:2229 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2718 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2719 src/headerview.c:233 src/query_search.c:687
 #: src/summaryview.c:2270
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2721
+#: src/compose.c:2722
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2836
+#: src/compose.c:2837
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2844
+#: src/compose.c:2845
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2845
+#: src/compose.c:2846
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2904
+#: src/compose.c:2894
+#, fuzzy
+msgid "Attachment is missing"
+msgstr "附加檔"
+
+#: src/compose.c:2895
+msgid "There is no attachment. Send it without attachments?"
+msgstr ""
+
+#: src/compose.c:2958
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2924
+#: src/compose.c:2978
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1633,25 +1642,25 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2938 src/send_message.c:315
+#: src/compose.c:2992 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2988
+#: src/compose.c:3042
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3026
+#: src/compose.c:3080
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3154 src/compose.c:3493 src/compose.c:3556 src/compose.c:3676
+#: src/compose.c:3208 src/compose.c:3547 src/compose.c:3610 src/compose.c:3730
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3187
+#: src/compose.c:3241
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1661,11 +1670,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3193
+#: src/compose.c:3247
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3279
+#: src/compose.c:3333
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,15 +1687,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3283
+#: src/compose.c:3337
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3445
+#: src/compose.c:3499
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3446
+#: src/compose.c:3500
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1695,93 +1704,93 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3636
+#: src/compose.c:3690
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3654
+#: src/compose.c:3708
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3742
+#: src/compose.c:3796
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3749
+#: src/compose.c:3803
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:3789
+#: src/compose.c:3843
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3852
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:4398
+#: src/compose.c:4452
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4513
+#: src/compose.c:4567
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4566 src/headerview.c:54
+#: src/compose.c:4620 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4640
+#: src/compose.c:4694
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4643
+#: src/compose.c:4697
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4681 src/compose.c:5797
+#: src/compose.c:4735 src/compose.c:5851
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4690 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:4744 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5693
+#: src/compose.c:5747
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5711
+#: src/compose.c:5765
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5779
+#: src/compose.c:5833
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5799 src/prefs_common_dialog.c:1512
+#: src/compose.c:5853 src/prefs_common_dialog.c:1543
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5822 src/prefs_folder_item.c:202
+#: src/compose.c:5876 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5823
+#: src/compose.c:5877
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5913
+#: src/compose.c:5967
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5975
+#: src/compose.c:6029
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1791,48 +1800,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6312 src/mainwindow.c:2976
+#: src/compose.c:6366 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6428 src/compose.c:6433 src/compose.c:6439
+#: src/compose.c:6484 src/compose.c:6489 src/compose.c:6495
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6530
+#: src/compose.c:6586
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6553
+#: src/compose.c:6609
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6588
+#: src/compose.c:6644
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6589
+#: src/compose.c:6645
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6591
+#: src/compose.c:6647
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6633
+#: src/compose.c:6689
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6635
+#: src/compose.c:6691
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6636
+#: src/compose.c:6692
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2014,7 +2023,7 @@ msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1949
 msgid " ... "
 msgstr "..."
 
@@ -2318,7 +2327,7 @@ msgstr "重建資料夾結構失敗。"
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1862 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1893 src/prefs_toolbar.c:65
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -4064,21 +4073,21 @@ msgstr "帳號設定"
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:690
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:697
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:692
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:699
 #: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
 msgid "Send"
 msgstr "送出"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:694
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:701
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:701
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:708
 msgid "Privacy"
 msgstr "私人資料"
 
@@ -4086,7 +4095,7 @@ msgstr "私人資料"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2204
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2235
 msgid "Advanced"
 msgstr "進階設定"
 
@@ -4212,7 +4221,7 @@ msgid "Authentication method"
 msgstr "認證方法"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:908 src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:918 src/prefs_common_dialog.c:2622
 msgid "Automatic"
 msgstr "自動"
 
@@ -4258,8 +4267,8 @@ msgstr "產生郵件識別碼"
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1618
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1649
+#: src/prefs_common_dialog.c:1676
 msgid " Edit... "
 msgstr " 編輯... "
 
@@ -4282,7 +4291,7 @@ msgid "Authenticate with POP3 before sending"
 msgstr "送信前先做 POP3 認證"
 
 #. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1017
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1048
 #: src/prefs_toolbar.c:114
 msgid "Signature"
 msgstr "簽章"
@@ -4590,278 +4599,288 @@ msgstr "刪除指令"
 msgid "Do you really want to delete this action?"
 msgstr "您確定要刪除這個指令嗎？"
 
-#: src/prefs_common_dialog.c:670
+#: src/prefs_common_dialog.c:677
 msgid "Creating common preferences window...\n"
 msgstr "產生一般設定視窗...\n"
 
-#: src/prefs_common_dialog.c:674
+#: src/prefs_common_dialog.c:681
 msgid "Common Preferences"
 msgstr "一般設定"
 
-#: src/prefs_common_dialog.c:696
+#: src/prefs_common_dialog.c:703
 msgid "Display"
 msgstr "顯示"
 
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:705
 msgid "Junk mail"
 msgstr "垃圾郵件"
 
-#: src/prefs_common_dialog.c:704
+#: src/prefs_common_dialog.c:711
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:758
+#: src/prefs_common_dialog.c:765
 msgid "Auto-check new mail"
 msgstr "自動檢查新郵件"
 
-#: src/prefs_common_dialog.c:760 src/prefs_common_dialog.c:1133
+#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:1164
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:1147
+#: src/prefs_common_dialog.c:779 src/prefs_common_dialog.c:1178
 msgid "minute(s)"
 msgstr "分鐘"
 
-#: src/prefs_common_dialog.c:781
+#: src/prefs_common_dialog.c:788
 msgid "Check new mail on startup"
 msgstr "開啟時檢查新郵件"
 
-#: src/prefs_common_dialog.c:783
+#: src/prefs_common_dialog.c:790
 msgid "Update all local folders after incorporation"
 msgstr "收信後更新所有資料夾"
 
-#: src/prefs_common_dialog.c:788
+#: src/prefs_common_dialog.c:795
 msgid "Execute command when new messages arrived"
 msgstr "收到新郵件時立即執行"
 
-#: src/prefs_common_dialog.c:800 src/prefs_common_dialog.c:2447
-#: src/prefs_common_dialog.c:2469 src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:807 src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2500 src/prefs_common_dialog.c:2522
 msgid "Command"
 msgstr "命令列"
 
-#: src/prefs_common_dialog.c:811
+#: src/prefs_common_dialog.c:818
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "「%d」將會被新郵件的數量所替換。"
 
-#: src/prefs_common_dialog.c:815
+#: src/prefs_common_dialog.c:822
 msgid "Incorporate from local spool"
 msgstr "從本機 spool 取得郵件"
 
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:835
 msgid "Filter on incorporation"
 msgstr "收信時過濾"
 
-#: src/prefs_common_dialog.c:834
+#: src/prefs_common_dialog.c:841
 msgid "Spool path"
 msgstr "Spool 路徑"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:895
 msgid "Save sent messages to outbox"
 msgstr "將已送出之郵件存到寄件夾"
 
-#: src/prefs_common_dialog.c:887
+#: src/prefs_common_dialog.c:897
 msgid "Apply filter rules to sent messages"
 msgstr "套用過濾器規則於寄出的郵件"
 
-#: src/prefs_common_dialog.c:894
+#: src/prefs_common_dialog.c:904
 msgid "Transfer encoding"
 msgstr "傳送之編碼"
 
-#: src/prefs_common_dialog.c:917
+#: src/prefs_common_dialog.c:927
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "請指定當郵件主體內容包含非 ASCII 字元時，使用哪種編碼來傳送內容。"
 
-#: src/prefs_common_dialog.c:924
+#: src/prefs_common_dialog.c:934
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "檔案名稱編碼"
 
-#: src/prefs_common_dialog.c:935
+#: src/prefs_common_dialog.c:945
 #, fuzzy
 msgid "MIME header"
 msgstr "檔案名稱編碼"
 
-#: src/prefs_common_dialog.c:945
+#: src/prefs_common_dialog.c:955
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1013 src/prefs_common_dialog.c:1402
+#: src/prefs_common_dialog.c:961
+msgid ""
+"Confirm attachments when the following strings (comma-separated) are found "
+"in the message body"
+msgstr ""
+
+#: src/prefs_common_dialog.c:972
+msgid "(Ex: attach)"
+msgstr ""
+
+#: src/prefs_common_dialog.c:1044 src/prefs_common_dialog.c:1433
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1059
 msgid "Signature separator"
 msgstr "簽章分隔符號"
 
-#: src/prefs_common_dialog.c:1037
+#: src/prefs_common_dialog.c:1068
 msgid "Insert automatically"
 msgstr "自動加入簽章"
 
-#: src/prefs_common_dialog.c:1039 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1070 src/prefs_toolbar.c:53
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1078
 msgid "Automatically select account for replies"
 msgstr "回信時在相關欄位上自動加入電子郵件信箱"
 
-#: src/prefs_common_dialog.c:1049
+#: src/prefs_common_dialog.c:1080
 msgid "Quote message when replying"
 msgstr "回信時引用原文"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1082
 msgid "Reply button invokes mailing list reply"
 msgstr "讀取郵遞論壇郵件時按下「回覆」鈕表示回覆給郵遞論壇"
 
-#: src/prefs_common_dialog.c:1053
+#: src/prefs_common_dialog.c:1084
 msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1057 src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:1088 src/prefs_common_dialog.c:2441
 #: src/prefs_toolbar.c:117
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/prefs_common_dialog.c:1064
+#: src/prefs_common_dialog.c:1095
 msgid "Automatically launch the external editor"
 msgstr "自動呼叫外部編輯器"
 
-#: src/prefs_common_dialog.c:1074
+#: src/prefs_common_dialog.c:1105
 msgid "Undo level"
 msgstr "復原紀錄"
 
-#: src/prefs_common_dialog.c:1094
+#: src/prefs_common_dialog.c:1125
 msgid "Wrap messages at"
 msgstr "每列最多"
 
-#: src/prefs_common_dialog.c:1106
+#: src/prefs_common_dialog.c:1137
 msgid "characters"
 msgstr "個字元"
 
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1147
 msgid "Wrap quotation"
 msgstr "折列時顯示符號"
 
-#: src/prefs_common_dialog.c:1122
+#: src/prefs_common_dialog.c:1153
 msgid "Wrap on input"
 msgstr "切割輸入過長的文字列"
 
-#: src/prefs_common_dialog.c:1131
+#: src/prefs_common_dialog.c:1162
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "儲存至草稿資料夾"
 
-#: src/prefs_common_dialog.c:1156
+#: src/prefs_common_dialog.c:1187
 #, fuzzy
 msgid "Format"
 msgstr "正常"
 
-#: src/prefs_common_dialog.c:1161
+#: src/prefs_common_dialog.c:1192
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1213
+#: src/prefs_common_dialog.c:1244
 msgid "Reply format"
 msgstr "回覆格式"
 
-#: src/prefs_common_dialog.c:1228 src/prefs_common_dialog.c:1270
+#: src/prefs_common_dialog.c:1259 src/prefs_common_dialog.c:1301
 msgid "Quotation mark"
 msgstr "引言符號"
 
 #. forward
-#: src/prefs_common_dialog.c:1255
+#: src/prefs_common_dialog.c:1286
 msgid "Forward format"
 msgstr "轉寄格式"
 
-#: src/prefs_common_dialog.c:1302
+#: src/prefs_common_dialog.c:1333
 msgid " Description of symbols "
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common_dialog.c:1331
+#: src/prefs_common_dialog.c:1362
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1343
+#: src/prefs_common_dialog.c:1374
 #, fuzzy
 msgid "Default language:"
 msgstr "預設的收件夾"
 
-#: src/prefs_common_dialog.c:1410
+#: src/prefs_common_dialog.c:1441
 #, fuzzy
 msgid "Text font"
 msgstr "文字"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1422
+#: src/prefs_common_dialog.c:1453
 msgid "Folder View"
 msgstr "資料夾檢視"
 
-#: src/prefs_common_dialog.c:1430
+#: src/prefs_common_dialog.c:1461
 msgid "Display unread number next to folder name"
 msgstr "若有未讀郵件，就顯示在資料夾名稱後面"
 
-#: src/prefs_common_dialog.c:1432
+#: src/prefs_common_dialog.c:1463
 msgid "Display message number columns in the folder view"
 msgstr "在資料夾檢視中顯示郵件編號欄"
 
-#: src/prefs_common_dialog.c:1441
+#: src/prefs_common_dialog.c:1472
 msgid "Abbreviate newsgroups longer than"
 msgstr "新聞群組縮寫長度大於"
 
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1487
 msgid "letters"
 msgstr "個字母"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1462
+#: src/prefs_common_dialog.c:1493
 msgid "Summary View"
 msgstr "郵件列表"
 
-#: src/prefs_common_dialog.c:1471
+#: src/prefs_common_dialog.c:1502
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "若發信人是你自己，就在郵件列表的來源中顯示收信人"
 
-#: src/prefs_common_dialog.c:1473
+#: src/prefs_common_dialog.c:1504
 msgid "Expand threads"
 msgstr "自動展開郵件串列"
 
-#: src/prefs_common_dialog.c:1481 src/prefs_common_dialog.c:2834
-#: src/prefs_common_dialog.c:2872
+#: src/prefs_common_dialog.c:1512 src/prefs_common_dialog.c:2865
+#: src/prefs_common_dialog.c:2903
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1533
 msgid " Set display item of summary... "
 msgstr "設定郵件列表選項..."
 
-#: src/prefs_common_dialog.c:1508
+#: src/prefs_common_dialog.c:1539
 msgid "Message"
 msgstr "郵件"
 
-#: src/prefs_common_dialog.c:1518
+#: src/prefs_common_dialog.c:1549
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1563
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1538
+#: src/prefs_common_dialog.c:1569
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/prefs_common_dialog.c:1552
+#: src/prefs_common_dialog.c:1583
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4869,308 +4888,308 @@ msgstr ""
 "若是選用「自動選擇」，系統將自動為您判斷而使用最\n"
 "適合的語區設定。"
 
-#: src/prefs_common_dialog.c:1614
+#: src/prefs_common_dialog.c:1645
 msgid "Enable coloration of message"
 msgstr "郵件中的引言與超連結顯示變色"
 
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1660
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
 
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1667
 msgid "Display header pane above message view"
 msgstr "在顯示郵件欄上方加入標頭資訊"
 
-#: src/prefs_common_dialog.c:1643
+#: src/prefs_common_dialog.c:1674
 msgid "Display short headers on message view"
 msgstr "在郵件預覽中顯示郵件標頭"
 
-#: src/prefs_common_dialog.c:1655
+#: src/prefs_common_dialog.c:1686
 msgid "Render HTML messages as text"
 msgstr "將 HTML 郵件轉為純文字"
 
-#: src/prefs_common_dialog.c:1657
+#: src/prefs_common_dialog.c:1688
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "將 HTML 郵件轉為純文字"
 
-#: src/prefs_common_dialog.c:1661
+#: src/prefs_common_dialog.c:1692
 msgid "Display cursor in message view"
 msgstr "在郵件預覽中顯示游標"
 
-#: src/prefs_common_dialog.c:1674
+#: src/prefs_common_dialog.c:1705
 msgid "Line space"
 msgstr "列間距"
 
-#: src/prefs_common_dialog.c:1688 src/prefs_common_dialog.c:1726
+#: src/prefs_common_dialog.c:1719 src/prefs_common_dialog.c:1757
 msgid "pixel(s)"
 msgstr "像素"
 
-#: src/prefs_common_dialog.c:1693
+#: src/prefs_common_dialog.c:1724
 msgid "Scroll"
 msgstr "捲軸"
 
-#: src/prefs_common_dialog.c:1700
+#: src/prefs_common_dialog.c:1731
 msgid "Half page"
 msgstr "一次半頁"
 
-#: src/prefs_common_dialog.c:1706
+#: src/prefs_common_dialog.c:1737
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_common_dialog.c:1712
+#: src/prefs_common_dialog.c:1743
 msgid "Step"
 msgstr "每次捲動"
 
-#: src/prefs_common_dialog.c:1732
+#: src/prefs_common_dialog.c:1763
 msgid "Images"
 msgstr "圖片"
 
-#: src/prefs_common_dialog.c:1740
+#: src/prefs_common_dialog.c:1771
 msgid "Resize attached large images to fit in the window"
 msgstr "調整附加圖片大小以適合視窗"
 
-#: src/prefs_common_dialog.c:1742
+#: src/prefs_common_dialog.c:1773
 msgid "Display images as inline"
 msgstr "在列間顯示圖片"
 
-#: src/prefs_common_dialog.c:1828
+#: src/prefs_common_dialog.c:1859
 msgid "Enable Junk mail control"
 msgstr "啟用垃圾郵件控制"
 
-#: src/prefs_common_dialog.c:1840
+#: src/prefs_common_dialog.c:1871
 msgid "Learning command:"
 msgstr "正在學習命令:"
 
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1880
 #, fuzzy
 msgid "(Select preset)"
 msgstr "選擇金鑰"
 
-#: src/prefs_common_dialog.c:1874
+#: src/prefs_common_dialog.c:1905
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
-#: src/prefs_common_dialog.c:1889
+#: src/prefs_common_dialog.c:1920
 msgid "Classifying command"
 msgstr "正在歸類命令"
 
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1931
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1910
+#: src/prefs_common_dialog.c:1941
 msgid "Junk folder"
 msgstr "垃圾郵件資料夾"
 
-#: src/prefs_common_dialog.c:1928
+#: src/prefs_common_dialog.c:1959
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "被歸類為垃圾郵件者將會被移到這個資料夾。"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1970
 msgid "Filter messages classified as junk on receiving"
 msgstr "接收郵件時對歸類為垃圾郵件者進行過濾"
 
-#: src/prefs_common_dialog.c:1942
+#: src/prefs_common_dialog.c:1973
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_common_dialog.c:1945
+#: src/prefs_common_dialog.c:1976
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1981
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2023
 msgid "Automatically check signatures"
 msgstr "自動檢查數位簽章"
 
-#: src/prefs_common_dialog.c:1995
+#: src/prefs_common_dialog.c:2026
 msgid "Show signature check result in a popup window"
 msgstr "將數位簽章檢查結果顯示在另一視窗"
 
-#: src/prefs_common_dialog.c:1998
+#: src/prefs_common_dialog.c:2029
 msgid "Store passphrase in memory temporarily"
 msgstr "將密碼片語暫時存在記憶體中"
 
-#: src/prefs_common_dialog.c:2013
+#: src/prefs_common_dialog.c:2044
 msgid "Expired after"
 msgstr "期限："
 
-#: src/prefs_common_dialog.c:2026
+#: src/prefs_common_dialog.c:2057
 msgid "minute(s) "
 msgstr "分鐘"
 
-#: src/prefs_common_dialog.c:2040
+#: src/prefs_common_dialog.c:2071
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "若設定為「0」則表示儲存密碼片語以供整個工作階段使用。"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2080
 msgid "Grab input while entering a passphrase"
 msgstr "輸入密碼片語時擷取輸入"
 
-#: src/prefs_common_dialog.c:2054
+#: src/prefs_common_dialog.c:2085
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2154
 msgid "Always open messages in summary when selected"
 msgstr "在郵件列表選擇郵件時開啟郵件"
 
-#: src/prefs_common_dialog.c:2127
+#: src/prefs_common_dialog.c:2158
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "進入資料夾時直接跳到第一封未讀郵件"
 
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2165
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/prefs_common_dialog.c:2138
+#: src/prefs_common_dialog.c:2169
 msgid "Only mark message as read when opened in new window"
 msgstr "只在開啟新郵件時標示為未讀"
 
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2173
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "接收完新郵件後直接進入收件夾中"
 
-#: src/prefs_common_dialog.c:2144
+#: src/prefs_common_dialog.c:2175
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "開啟時檢查新郵件"
 
-#: src/prefs_common_dialog.c:2152
+#: src/prefs_common_dialog.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移動或刪除郵件時立即執行"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "若此選項關閉，則必須按下「執行」才會執行移動或刪除。"
 
-#: src/prefs_common_dialog.c:2173
+#: src/prefs_common_dialog.c:2204
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "讓按鈕的順序相容於 GNOME HIG"
 
-#: src/prefs_common_dialog.c:2176
+#: src/prefs_common_dialog.c:2207
 #, fuzzy
 msgid "Display tray icon"
 msgstr "顯示名稱"
 
-#: src/prefs_common_dialog.c:2178
+#: src/prefs_common_dialog.c:2209
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2211
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2221
 msgid " Set key bindings... "
 msgstr "設定熱鍵..."
 
-#: src/prefs_common_dialog.c:2196 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2227 src/select-keys.c:347
 msgid "Other"
 msgstr "其他"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2231
 #, fuzzy
 msgid "External commands"
 msgstr "執行命令"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2284
 msgid "Receive dialog"
 msgstr "接收進度對話框"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2294
 msgid "Show receive dialog"
 msgstr "顯示接收郵件的進度對話框"
 
-#: src/prefs_common_dialog.c:2273
+#: src/prefs_common_dialog.c:2304
 msgid "Always"
 msgstr "一律顯示"
 
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2305
 msgid "Only on manual receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_common_dialog.c:2276
+#: src/prefs_common_dialog.c:2307
 msgid "Never"
 msgstr "不顯示"
 
-#: src/prefs_common_dialog.c:2281
+#: src/prefs_common_dialog.c:2312
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不要開啟錯誤視窗。"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2315
 msgid "Close receive dialog when finished"
 msgstr "完成時關閉接收郵件的進度對話框"
 
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2326
 msgid "Add address to destination when double-clicked"
 msgstr "在通訊錄中，可利用雙擊直接將該電子郵件加入收信人中"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2328
 msgid "On exit"
 msgstr "離開設定"
 
-#: src/prefs_common_dialog.c:2305
+#: src/prefs_common_dialog.c:2336
 msgid "Confirm on exit"
 msgstr "離開時確認"
 
-#: src/prefs_common_dialog.c:2312
+#: src/prefs_common_dialog.c:2343
 msgid "Empty trash on exit"
 msgstr "離開時清空刪除的郵件"
 
-#: src/prefs_common_dialog.c:2314
+#: src/prefs_common_dialog.c:2345
 msgid "Ask before emptying"
 msgstr "清除時確認"
 
-#: src/prefs_common_dialog.c:2318
+#: src/prefs_common_dialog.c:2349
 msgid "Warn if there are queued messages"
 msgstr "離開時若有尚未送出之郵件即發出警告"
 
-#: src/prefs_common_dialog.c:2373
+#: src/prefs_common_dialog.c:2404
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部指令（%s 將會被置換成檔名或 URI）"
 
-#: src/prefs_common_dialog.c:2382
+#: src/prefs_common_dialog.c:2413
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_common_dialog.c:2394 src/prefs_common_dialog.c:3847
-#: src/prefs_common_dialog.c:3868
+#: src/prefs_common_dialog.c:2425 src/prefs_common_dialog.c:3878
+#: src/prefs_common_dialog.c:3899
 msgid "(Default browser)"
 msgstr "(預設的瀏覽器)"
 
-#: src/prefs_common_dialog.c:2435
+#: src/prefs_common_dialog.c:2466
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "用其他外部程式來送信"
 
-#: src/prefs_common_dialog.c:2457
+#: src/prefs_common_dialog.c:2488
 msgid "Use external program for incorporation"
 msgstr "用其他外部程式來收信"
 
-#: src/prefs_common_dialog.c:2479
+#: src/prefs_common_dialog.c:2510
 msgid "Use external program for sending"
 msgstr "用其他外部程式來送信"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2569
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "啟用對於郵件列表快取整合性的嚴格檢查"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2572
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5179,279 +5198,279 @@ msgstr ""
 "如果資料夾的內容有被其他應用軟體更動過的可能，就開啟它。\n"
 "此一選項將會降低郵件列表的顯示效能。"
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2579
 msgid "Socket I/O timeout:"
 msgstr "插槽 I/O 等待時間："
 
-#: src/prefs_common_dialog.c:2561
+#: src/prefs_common_dialog.c:2592
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2620
 msgid "Automatic (Recommended)"
 msgstr "自動選擇（推薦使用）"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2625
 msgid "7bit ascii (US-ASCII)"
 msgstr "七位元 ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2596
+#: src/prefs_common_dialog.c:2627
 msgid "Unicode (UTF-8)"
 msgstr "統一碼 (UTF-8)"
 
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2629
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐語系 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2630
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2632
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2605
+#: src/prefs_common_dialog.c:2636
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐語系 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2638
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2608
+#: src/prefs_common_dialog.c:2639
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2640
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2642
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2644
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2645
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2647
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯來語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2617
+#: src/prefs_common_dialog.c:2648
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯來語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2650
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2621
+#: src/prefs_common_dialog.c:2652
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2653
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫語 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2654
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫語 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2655
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2657
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2628
+#: src/prefs_common_dialog.c:2659
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2629
+#: src/prefs_common_dialog.c:2660
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2663
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2664
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_common_dialog.c:2634
+#: src/prefs_common_dialog.c:2665
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2636
+#: src/prefs_common_dialog.c:2667
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2637
+#: src/prefs_common_dialog.c:2668
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2640
+#: src/prefs_common_dialog.c:2671
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2642
+#: src/prefs_common_dialog.c:2673
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2643
+#: src/prefs_common_dialog.c:2674
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2841
 msgid "the full abbreviated weekday name"
 msgstr "週一、週二、..."
 
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2842
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2843
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2844
 msgid "the full month name"
 msgstr "一月、二月、..."
 
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2845
 msgid "the preferred date and time for the current locale"
 msgstr "目前語區設定所偏好的日期與時間"
 
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2846
 msgid "the century number (year/100)"
 msgstr "世紀 (年/100)"
 
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2847
 msgid "the day of the month as a decimal number"
 msgstr "今天是幾號 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2848
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "現在幾點鐘 (廿四時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2849
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "現在幾點鐘 (十二時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2819
+#: src/prefs_common_dialog.c:2850
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2820
+#: src/prefs_common_dialog.c:2851
 msgid "the month as a decimal number"
 msgstr "現在是幾月 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2821
+#: src/prefs_common_dialog.c:2852
 msgid "the minute as a decimal number"
 msgstr "現在是幾分 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2822
+#: src/prefs_common_dialog.c:2853
 msgid "either AM or PM"
 msgstr "上午或下午"
 
-#: src/prefs_common_dialog.c:2823
+#: src/prefs_common_dialog.c:2854
 msgid "the second as a decimal number"
 msgstr "現在是幾秒 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2824
+#: src/prefs_common_dialog.c:2855
 msgid "the day of the week as a decimal number"
 msgstr "現在是一週的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2825
+#: src/prefs_common_dialog.c:2856
 msgid "the preferred date for the current locale"
 msgstr "目前語區設定所偏好的日期"
 
-#: src/prefs_common_dialog.c:2826
+#: src/prefs_common_dialog.c:2857
 msgid "the last two digits of a year"
 msgstr "公元年份的後兩位數字"
 
-#: src/prefs_common_dialog.c:2827
+#: src/prefs_common_dialog.c:2858
 msgid "the year as a decimal number"
 msgstr "公元年份 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2828
+#: src/prefs_common_dialog.c:2859
 msgid "the time zone or name or abbreviation"
 msgstr "時區名稱或縮寫"
 
-#: src/prefs_common_dialog.c:2849
+#: src/prefs_common_dialog.c:2880
 msgid "Specifier"
 msgstr "特殊符號"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2881
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2890
+#: src/prefs_common_dialog.c:2921
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_common_dialog.c:2971
+#: src/prefs_common_dialog.c:3002
 msgid "Set message colors"
 msgstr "設定顏色"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:3010
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_common_dialog.c:3013
+#: src/prefs_common_dialog.c:3044
 msgid "Quoted Text - First Level"
 msgstr "引言內容 - 第一層"
 
-#: src/prefs_common_dialog.c:3019
+#: src/prefs_common_dialog.c:3050
 msgid "Quoted Text - Second Level"
 msgstr "引言內容 - 第二層"
 
-#: src/prefs_common_dialog.c:3025
+#: src/prefs_common_dialog.c:3056
 msgid "Quoted Text - Third Level"
 msgstr "引言內容 - 第三層"
 
-#: src/prefs_common_dialog.c:3031
+#: src/prefs_common_dialog.c:3062
 msgid "URI link"
 msgstr "超連結"
 
-#: src/prefs_common_dialog.c:3038
+#: src/prefs_common_dialog.c:3069
 msgid "Recycle quote colors"
 msgstr "三層以上引言則重複使用指定的顏色"
 
-#: src/prefs_common_dialog.c:3105
+#: src/prefs_common_dialog.c:3136
 msgid "Pick color for quotation level 1"
 msgstr "選擇第一層引言的顏色"
 
-#: src/prefs_common_dialog.c:3108
+#: src/prefs_common_dialog.c:3139
 msgid "Pick color for quotation level 2"
 msgstr "選擇第二層引言的顏色"
 
-#: src/prefs_common_dialog.c:3111
+#: src/prefs_common_dialog.c:3142
 msgid "Pick color for quotation level 3"
 msgstr "選擇第三層引言的顏色"
 
-#: src/prefs_common_dialog.c:3114
+#: src/prefs_common_dialog.c:3145
 msgid "Pick color for URI"
 msgstr "選擇超連結的顏色"
 
-#: src/prefs_common_dialog.c:3254
+#: src/prefs_common_dialog.c:3285
 msgid "Description of symbols"
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common_dialog.c:3310
+#: src/prefs_common_dialog.c:3341
 msgid ""
 "Date\n"
 "From\n"
@@ -5475,11 +5494,11 @@ msgstr ""
 "新聞群組\n"
 "郵件識別碼"
 
-#: src/prefs_common_dialog.c:3323
+#: src/prefs_common_dialog.c:3354
 msgid "If x is set, displays expr"
 msgstr "若 x 已設定則顯示正規表示式"
 
-#: src/prefs_common_dialog.c:3327
+#: src/prefs_common_dialog.c:3358
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5493,7 +5512,7 @@ msgstr ""
 "引言（不含簽章）\n"
 "% 符號"
 
-#: src/prefs_common_dialog.c:3335
+#: src/prefs_common_dialog.c:3366
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5505,19 +5524,19 @@ msgstr ""
 "左大括弧\n"
 "右大括弧"
 
-#: src/prefs_common_dialog.c:3389
+#: src/prefs_common_dialog.c:3420
 msgid "Key bindings"
 msgstr "熱鍵設定"
 
-#: src/prefs_common_dialog.c:3402
+#: src/prefs_common_dialog.c:3433
 msgid "Select the preset of key bindings."
 msgstr "選擇事先設定的按鍵組合。"
 
-#: src/prefs_common_dialog.c:3412 src/prefs_common_dialog.c:3736
+#: src/prefs_common_dialog.c:3443 src/prefs_common_dialog.c:3767
 msgid "Default"
 msgstr "預設值"
 
-#: src/prefs_common_dialog.c:3415 src/prefs_common_dialog.c:3745
+#: src/prefs_common_dialog.c:3446 src/prefs_common_dialog.c:3776
 msgid "Old Sylpheed"
 msgstr "舊設定"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2008-03-28 07:15:51 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2008-03-28 07:15:51 +0000
commit	eb8893ef1a4f97c86f0fa4bacb8695f8d26ccb29 (patch)
tree	d9cad24a5faf420b73325e6b7eef0df572877b4e /po
parent	faa04e6bd711567a9b2437d7d99593baac90fad6 (diff)